merge r6004 from trunk

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index bf8d63ae972313cd8c35df2b04f89825536a4c62..18ca37f72d14aa3f8b66f669d253efcad5d7a424 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -329,7 +329,8 @@ void keyboard_shutdown(gboolean reconfig)
     if (!reconfig)
         client_remove_destructor(keyboard_interactive_end_client);
 
-    keyboard_interactive_end(0, TRUE, 0, TRUE);
+    if (istate.active)
+        keyboard_interactive_end(0, TRUE, 0, TRUE);
 
     ob_main_loop_timeout_remove(ob_main_loop, chain_timeout);