fix bug with SemiFollow

6 files changed, 11 insertions, 19 deletions

diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc
index c70da85..ae35aab 100644
--- a/src/ClientMenu.cc
+++ b/src/ClientMenu.cc
@@ -46,9 +46,14 @@ public:
         FluxboxWindow *fbwin = m_client.fbwindow();
         if (fbwin == 0)
             return;
+
+        // this MenuItem object can get destroyed as a result of focus(), so we
+        // must get a local copy of the parent menu
+        FbTk::Menu *parent = menu();
+
         m_client.focus();
         fbwin->raise();
-        menu()->hide();
+        parent->hide();
     }
 
     const std::string &label() const { return m_client.title(); }
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 0559f0d..f10f1b7 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -111,6 +111,7 @@ Menu::Menu(MenuTheme &tm, ImageControl &imgctrl):
 
     m_internal_menu =
         m_moving =
+        m_closing =
         m_torn =
         m_visible = false;
 
diff --git a/src/Screen.cc b/src/Screen.cc
index 9a7d433..a87a842 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1329,7 +1329,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
     if (id == currentWorkspace()->workspaceID() && !win->isIconic())
         win->deiconify(false, false);
     else {
-        win->withdraw(true);
+        win->hide(true);
         FocusControl::revertFocus(*this);
     }
 
diff --git a/src/Window.cc b/src/Window.cc
index 74deb9b..9ec92c4 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1389,7 +1389,7 @@ bool FluxboxWindow::focus() {
         // fetch the window to the current workspace
         if (model == BScreen::FETCH_ACTIVE_WINDOW ||
             (isIconic() && model == BScreen::SEMIFOLLOW_ACTIVE_WINDOW))
-            screen().sendToWorkspace(screen().currentWorkspaceID(), this, true);
+            screen().sendToWorkspace(screen().currentWorkspaceID(), this, false);
         // warp to the workspace of the window
         else
             screen().changeWorkspaceID(workspaceNumber());
@@ -1586,18 +1586,6 @@ void FluxboxWindow::deiconify(bool reassoc, bool do_raise) {
         raise();
 }
 
-/**
- Set window in withdrawn state
-*/
-void FluxboxWindow::withdraw(bool interrupt_moving) {
-#ifdef DEBUG
-    cerr<<"FluxboxWindow::"<<__FUNCTION__<<": this = "<<this<<endl;
-#endif // DEBUG
-    iconic = false;
-
-    hide(interrupt_moving);
-}
-
 /** setFullscreen mode:
 
     - maximize as big as the screen is, dont care about slit / toolbar
@@ -3901,7 +3889,7 @@ void FluxboxWindow::changeBlackboxHints(const BlackboxHints &net) {
         screen().reassociateWindow(this, net.workspace, true);
 
         if (screen().currentWorkspaceID() != net.workspace)
-            withdraw(true);
+            hide(true);
         else
             deiconify();
     }
diff --git a/src/Window.hh b/src/Window.hh
index cb32768..d4040fc 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -266,8 +266,6 @@ public:
     void close();
     /// kill current client
     void kill();
-    /// set the window in withdrawn state
-    void withdraw(bool interrupt_moving);
     /// set fullscreen
     void setFullscreen(bool flag);
     /// toggle maximize
diff --git a/src/Workspace.cc b/src/Workspace.cc
index fe30a8f..e1dcc7a 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -140,7 +140,7 @@ void Workspace::hideAll(bool interrupt_moving) {
     Windows::reverse_iterator it_end = m_windowlist.rend();
     for (; it != it_end; ++it) {
         if (! (*it)->isStuck())
-            (*it)->withdraw(interrupt_moving);
+            (*it)->hide(interrupt_moving);
     }
 }