Skip to content

main: Unset the right prevFocus actor after the focus stack got shifted

Jonas Dreßler requested to merge verdre/gnome-shell:fix-lockscreen-issue into master

When a modal that's not on top of the modalActorFocusStack gets popped, we shift the focus stack as described in popModal() to ensure the chain remains correct. That however destroys the association of a modal actor and its prevFocus actor on the focus stack, because the prevFocus actors are now moved to different entries of the stack.

Now when a prevFocus actor gets destroyed, we don't handle that case correctly and search for the modal actor that was associated with the prevFocus actor before the stack was shifted, which means we end up unsetting the wrong prevFocus actor.

So fix that and search the stack for the prevFocus actor which is being destroyed instead to unset the correct entry.

Thanks to Florian Müllner for figuring out the actual issue and proposing this fix.

Fixes #2446 (closed)

Edited by Jonas Dreßler

Merge request reports