diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-03 04:32:44 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-03 04:32:44 +0000 |
| commit | 53975abf1220c36ebbab455299a9915477c5a6b8 (patch) | |
| tree | 9b0203c34697f324da18fed640135448ac4c9650 /openbox/keyboard.c | |
| parent | 75c63eece530871664cedb11ff348945643fcaa2 (diff) | |
merge r6004 from trunk
Diffstat (limited to 'openbox/keyboard.c')
| -rw-r--r-- | openbox/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |