X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fkeyboard.c;h=11b3a98509a058fa6964384342f123f117b13fbc;hb=c8678108eb876bbe78649569dabb3b3ee5e595aa;hp=7a74b427c9e3fda3a63dfa57780912f201189c6a;hpb=e5908c3f897156b13d1e7592c155bfd5ca2a82a4;p=chaz%2Fopenbox

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 7a74b427..11b3a985 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -162,9 +162,6 @@ void keyboard_interactive_grab(guint state, ObClient *client,
 
     g_assert(action->data.any.interactive);
 
-    if (moveresize_in_progress)
-        moveresize_end(FALSE);
-
     if (!interactive_states) {
         if (!grab_keyboard(TRUE))
             return;
@@ -200,18 +197,17 @@ void keyboard_interactive_end(ObInteractiveState *s,
     }
 }
 
-void keyboard_interactive_end_client(gpointer data)
+void keyboard_interactive_end_client(ObClient *client, gpointer data)
 {
     GSList *it, *next;
-    ObClient *c = data;
 
     for (it = interactive_states; it; it = next) {
         ObInteractiveState *s = it->data;
 
         next = g_slist_next(it);
 
-        if (s->client == c)
-            keyboard_interactive_end(s, 0, FALSE);
+        if (s->client == client)
+            s->client = NULL;
     }
 }
 
@@ -294,7 +290,7 @@ void keyboard_startup(gboolean reconfig)
     grab_keys(TRUE);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client);
+        client_add_destructor(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)