Merge branch 'master' into chaz

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 95433acc7782bbc97e1ea9b260b70877ba147b45..8f4424ea97d43c8c233b69886def08c1f9e5396f 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -66,7 +66,6 @@ static void grab_keys(gboolean grab)
 static gboolean chain_timeout(gpointer data)
 {
     keyboard_reset_chains(0);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -314,7 +313,8 @@ void keyboard_rebind(void)
 
     old = keyboard_firstnode;
     keyboard_firstnode = NULL;
-    node_rebind(old);
+    if (old)
+        node_rebind(old);
 
     tree_destroy(old);
     set_curpos(NULL);