From: Dana Jansens Date: Thu, 3 May 2007 04:32:44 +0000 (+0000) Subject: merge r6004 from trunk X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=53975abf1220c36ebbab455299a9915477c5a6b8;p=chaz%2Fopenbox merge r6004 from trunk --- diff --git a/openbox/keyboard.c b/openbox/keyboard.c index bf8d63ae..18ca37f7 100644 --- 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);