merge r6004 from trunk
Dana Jansens danakj@orodu.net
1 files changed,
2 insertions(+),
1 deletions(-)
jump to
M
openbox/keyboard.c
→
openbox/keyboard.c
@@ -329,7 +329,8 @@ {
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);