end the other action when starting a new interactive action while one was in place

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 5bda7a7bfddee85807effcba085ddbd20d21819e..b0d8d3a91365589c40c66fa071f9c7a709ee0e44 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -120,6 +120,18 @@ void keyboard_interactive_grab(guint state, ObClient *client,
             return;
         }
         interactive_grab = TRUE;
+    } else if (action != grabbed_action) {
+        /* finish it */
+        if (grabbed_action->func == action_cycle_windows) {
+            grabbed_action->data.cycle.final = TRUE;
+        }
+        if (grabbed_action->func == action_desktop_dir) {
+            grabbed_action->data.desktopdir.final = TRUE;
+        }
+        if (grabbed_action->func == action_send_to_desktop_dir) {
+            grabbed_action->data.sendtodir.final = TRUE;
+        }
+        grabbed_action->func(&grabbed_action->data);
     }
 
     grabbed_state = state;