M src/FbCommands.cc → src/FbCommands.cc

@@ -80,7 +80,7 @@ if(fb->menuTimestampsChanged()) {
             // we dont show the menu here because fluxbox
             // will bring up the rootmenu after the timed
             // reread of the menu
-            fb->rereadMenu(true);
+            fb->rereadMenu();
             return;
         }
     }

M src/fluxbox.cc → src/fluxbox.cc

@@ -399,7 +399,7 @@ 
     //XSynchronize(disp, False);
     sync(false);
 
-    m_reconfigure_wait = m_reread_menu_wait = false;
+    m_reconfigure_wait = false;
 
     m_resourcemanager.unlock();
     ungrab();
@@ -1484,28 +1484,15 @@ // no timestamp changed
     return false;
 }
 
-void Fluxbox::rereadMenu(bool show_after_reread) {
-    m_reread_menu_wait = true;
-    m_show_menu_after_reread = show_after_reread;
-    m_reconfig_timer.start();
-}
-
-
-void Fluxbox::real_rereadMenu() {
-
+void Fluxbox::rereadMenu() {
     clearMenuFilenames();
 
     for_each(m_screen_list.begin(),
              m_screen_list.end(),
              mem_fun(&BScreen::rereadMenu));
 
-    if(m_show_menu_after_reread) {
-
-        FbCommands::ShowRootMenuCmd showcmd;
-        showcmd.execute();
-
-        m_show_menu_after_reread = false;
-    }
+    FbCommands::ShowRootMenuCmd showcmd;
+    showcmd.execute();
 }
 
 void Fluxbox::saveMenuFilename(const char *filename) {
@@ -1546,10 +1533,7 @@ void Fluxbox::timed_reconfigure() {
     if (m_reconfigure_wait)
         real_reconfigure();
 
-    if (m_reread_menu_wait)
-        real_rereadMenu();
-
-    m_reconfigure_wait = m_reread_menu_wait = false;
+    m_reconfigure_wait = false;
 }
 
 void Fluxbox::revertFocus() {

M src/fluxbox.hh → src/fluxbox.hh

@@ -149,7 +149,7 @@ void removeWindowSearchGroup(Window win);
     void removeGroupSearch(Window win);
     void restart(const char *command = 0);
     void reconfigure();
-    void rereadMenu(bool show_after_reread = false);
+    void rereadMenu();
     /// reloads the menus if the timestamps changed
 
     /// handle any system signal sent to the application
@@ -201,7 +201,6 @@ 
     std::string getRcFilename();
     void load_rc();
 
-    void real_rereadMenu();
     void real_reconfigure();
 
     void handleEvent(XEvent *xe);
@@ -251,7 +250,7 @@ BScreen *m_mousescreen, *m_keyscreen;
 
     Atom m_fluxbox_pid;
 
-    bool m_reconfigure_wait, m_reread_menu_wait;
+    bool m_reconfigure_wait;
     Time m_last_time;
     Window m_masked;
     std::string m_rc_file; ///< resource filename
@@ -279,7 +278,6 @@ 
     bool m_starting;
     bool m_restarting;
     bool m_shutdown;
-    bool m_show_menu_after_reread;
     int m_server_grabs;
     int m_randr_event_type; ///< the type number of randr event
     int m_shape_eventbase; ///< event base for shape events