X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=bf7723365fdde511c1fa1e39ccbd68ba951f191c;hb=5e9e266722826fbd5907df1bf900864ab23f6539;hp=ffbcd5cae8c7074f08d3e99ea3a762e23246558a;hpb=4a45cabd4fb99ac787a3f84f89541e1c76e578b4;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index ffbcd5ca..bf772336 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2540,8 +2540,7 @@ gboolean client_hide(ObClient *self)
                actions should not rely on being able to move focus during an
                interactive grab.
             */
-            if (keyboard_interactively_grabbed())
-                keyboard_interactive_cancel();
+            event_cancel_all_key_grabs();
         }
 
         frame_hide(self->frame);
@@ -3526,8 +3525,7 @@ gboolean client_focus(ObClient *self)
        actions should not rely on being able to move focus during an
        interactive grab.
     */
-    if (keyboard_interactively_grabbed())
-        keyboard_interactive_cancel();
+    event_cancel_all_key_grabs();
 
     xerror_set_ignore(TRUE);
     xerror_occured = FALSE;