projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
75c63ee
)
merge r6004 from trunk
author
Dana Jansens
<danakj@orodu.net>
Thu, 3 May 2007 04:32:44 +0000
(
04:32
+0000)
committer
Dana Jansens
<danakj@orodu.net>
Thu, 3 May 2007 04:32:44 +0000
(
04:32
+0000)
openbox/keyboard.c
patch
|
blob
|
history
diff --git
a/openbox/keyboard.c
b/openbox/keyboard.c
index
bf8d63a
..
18ca37f
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);