Merge branch 'master' into 'kill'

This commit is contained in:
mergify-bot 2018-07-20 16:20:24 +02:00
commit b3d2e0388e
1 changed files with 0 additions and 1 deletions

View File

@ -156,7 +156,6 @@ drawin_systray_kickout(drawin_t *w)
/* Who! Check that we're not deleting a drawin with a systray, because it /* Who! Check that we're not deleting a drawin with a systray, because it
* may be its parent. If so, we reparent to root before, otherwise it will * may be its parent. If so, we reparent to root before, otherwise it will
* hurt very much. */ * hurt very much. */
systray_cleanup();
xcb_reparent_window(globalconf.connection, xcb_reparent_window(globalconf.connection,
globalconf.systray.window, globalconf.systray.window,
globalconf.screen->root, globalconf.screen->root,