From 61dd925b32362a53956329d8d99733640e161d2c Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Sun, 14 May 2017 21:30:16 +0200
Subject: [PATCH] gdk: Ensure to implicitly deactivate grabs when an impl
 window is hidden

For some reason this wasn't done on windows with an impl, but it totally should.
Probably hidden by grabs in menus and somesuch being done on a child window.
---
 gdk/gdkwindow.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 9a1616ce86..b117e09818 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -3879,6 +3879,9 @@ gdk_window_hide (GdkWindow *window)
 				     GDK_WINDOW_STATE_WITHDRAWN);
     }
   else if (was_mapped)
+    window->state = GDK_WINDOW_STATE_WITHDRAWN;
+
+  if (was_mapped)
     {
       GdkDisplay *display;
       GdkSeat *seat;
@@ -3908,7 +3911,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
             }
         }
 
-      window->state = GDK_WINDOW_STATE_WITHDRAWN;
       g_list_free (devices);
     }