Fix segfault on shutdown

There was a problem deep within how the menus were connected and when and
what gets deleted. It was clearly related to a menu which was kind of
global. In order to better understand the code flow I eliminated the
ExtraMenu code: it was used only to get the Remember-Menu into the
Window-Menu. Instead of having a singleton of the Remember-Menu and fight
against the shaky interconnections we just create a new one on demand
and delete when the menu gets deleted. Looks like this fixes the problem.

The menu code needs more love anyway.

Closes #1118

1 files changed, 0 insertions, 5 deletions

diff --git a/src/Screen.hh b/src/Screen.hh
index 771899f..c9a6ede 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -82,7 +82,6 @@ public:
 
     typedef std::vector<Workspace *> Workspaces;
     typedef std::vector<std::string> WorkspaceNames;
-    typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus;
 
     BScreen(FbTk::ResourceManager &rm,
             const std::string &screenname, const std::string &altscreenname,
@@ -113,8 +112,6 @@ public:
     FbMenu &configMenu() { return *m_configmenu.get(); }
     const FbMenu &windowMenu() const { return *m_windowmenu.get(); }
     FbMenu &windowMenu() { return *m_windowmenu.get(); }
-    ExtraMenus &extraWindowMenus() { return m_extramenus; }
-    const ExtraMenus &extraWindowMenus() const { return m_extramenus; }
 
     FbWinFrame::TabPlacement getTabPlacement() const { return *resource.tab_placement; }
 
@@ -480,8 +477,6 @@ private:
     std::auto_ptr<FbTk::ImageControl> m_image_control;
     std::auto_ptr<FbMenu> m_configmenu, m_rootmenu, m_workspacemenu, m_windowmenu;
 
-    ExtraMenus m_extramenus;
-
     Icons m_icon_list;
 
     std::auto_ptr<Slit> m_slit;