From 0ab6f4af175bef2933f7d8339057d08549139008 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 3 May 2007 04:33:30 +0000 Subject: [PATCH] merge r6006 from trunk. 6006 was supposed to say stop an assert from fireing on shutdown --- openbox/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.34.1