From 8c2cee577a744870fd497f73a21c2d4e1c45c907 Mon Sep 17 00:00:00 2001
From: Henrik Kinnunen <fluxgen@fluxbox.org>
Date: Tue, 15 Jan 2008 10:56:25 +0100
Subject: must initialize toolbar before the windows

---
 src/Screen.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Screen.cc b/src/Screen.cc
index 578b0c7..6af65a9 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -629,6 +629,12 @@ bool BScreen::isRestart() {
 }
 
 void BScreen::initWindows() {
+
+#ifdef USE_TOOLBAR
+    m_toolbar.reset(new Toolbar(*this,
+                                *layerManager().getLayer(::Layer::NORMAL)));
+#endif // USE_TOOLBAR
+
     unsigned int nchild;
     Window r, p, *children;
     Display *disp = FbTk::App::instance()->display();
@@ -726,11 +732,6 @@ void BScreen::initWindows() {
         slit()->show();
 #endif // SLIT
 
-#ifdef USE_TOOLBAR
-    m_toolbar.reset(new Toolbar(*this,
-                                *layerManager().getLayer(::Layer::NORMAL)));
-#endif // USE_TOOLBAR
-
 }
 
 unsigned int BScreen::currentWorkspaceID() const {
-- 
cgit v0.11.2