Merge branch 'master' into chaz

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 5b8016dd9d6b5a98d773336459514c3b314a3885..8f4424ea97d43c8c233b69886def08c1f9e5396f 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -313,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);