summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen W. Taylor <otaylor@fishsoup.net>2013-12-18 09:23:08 -0500
committerOwen W. Taylor <otaylor@fishsoup.net>2013-12-24 11:29:19 -0500
commited4fb0695ed7b2fddbc0855e1e993b5e2ab4ef87 (patch)
tree824f971694926f87a8f47bbe359e221eb671eda7
parentaddac8825d814d2491b77e11c631cac823e1b73e (diff)
downloadmutter-ed4fb0695ed7b2fddbc0855e1e993b5e2ab4ef87.tar.gz
Be willing to unfocus the grab window when we are unmanaging it
When we are unmanaging the grab window, we /need/ to unfocus it, so we shouldn't bail out early from meta_window_focus(). https://bugzilla.gnome.org/show_bug.cgi?id=711618
-rw-r--r--src/core/window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/window.c b/src/core/window.c
index cf5cd7daa..c1dbb7be8 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5997,7 +5997,8 @@ meta_window_focus (MetaWindow *window,
window->desc, window->input, window->take_focus);
if (window->display->grab_window &&
- window->display->grab_window->all_keys_grabbed)
+ window->display->grab_window->all_keys_grabbed &&
+ !window->display->grab_window->unmanaging)
{
meta_topic (META_DEBUG_FOCUS,
"Current focus window %s has global keygrab, not focusing window %s after all\n",