From b90aa39dc975ff75400a99ac7b17e711fe30cf0f Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Sun, 18 Jul 2010 16:20:24 +0200 Subject: [PATCH] Fix a brown paper bag bug in d7d70714d7943ac4 I cherry-picked this commit from master and there was a conflict. I fixed this up by hand and apparently failed here. Instead of first saving the systray window and then destroying the wibox, this first destroyed the wibox and then tried to save the systray, but it was already destroyed in the previous step. Just swapping these two calls fixes this. Thanks to anrxc for making me notice how much I fail. Signed-off-by: Uli Schlachter --- wibox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wibox.c b/wibox.c index c6becc5b..85dffdef 100644 --- a/wibox.c +++ b/wibox.c @@ -696,10 +696,10 @@ wibox_wipe(wibox_t *w) /* Activate BMA */ client_ignore_enterleave_events(); - xcb_destroy_window(globalconf.connection, w->window); /* Make sure we don't accidentally kill the systray window */ if(globalconf.screens.tab[phys_screen].systray.parent == w->window) wibox_systray_kickout(phys_screen); + xcb_destroy_window(globalconf.connection, w->window); /* Deactivate BMA */ client_restore_enterleave_events(); w->window = XCB_NONE;