oops

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index eaaba4ab6c521cda3d432c73477736fe6abd9bb0..75bd6bcda1b12226ead135a4cd3413ca7bff48fe 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -22,6 +22,8 @@ void focus_startup()
        mapped. */
     XSetWindowAttributes attrib;
 
+    focus_client = NULL;
+
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
                                 -100, -100, 1, 1, 0, 0, InputOnly,
@@ -39,8 +41,9 @@ void focus_shutdown()
     for (i = 0; i < screen_num_desktops; ++i)
         g_list_free(focus_order[i]);
     g_free(focus_order);
+    focus_order = NULL;
 
-    XDestroyWindow(focus_backup);
+    XDestroyWindow(ob_display, focus_backup);
 
     /* reset focus to root */
     XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);