From 5b1d98aba9c6299f950c3561d853c96fd522530e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 8 Sep 2010 16:59:59 -0600
Subject: [PATCH] Hide visible menus before clearing toolbar. Fixes #6706
 (Clicking the Connect/Share button during startup crashes Calibre 0.7.17)

---
 src/calibre/gui2/layout.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index 68f093da95..58d5267c8e 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -215,6 +215,7 @@ class ToolBar(QToolBar): # {{{
         self.location_manager.locations_changed.connect(self.build_bar)
         donate.setAutoRaise(True)
         donate.setCursor(Qt.PointingHandCursor)
+        self.added_actions = []
         self.build_bar()
         self.preferred_width = self.sizeHint().width()
 
@@ -237,7 +238,13 @@ class ToolBar(QToolBar): # {{{
         actions = '-device' if showing_device else ''
         actions = gprefs['action-layout-toolbar'+actions]
 
+        for ac in self.added_actions:
+            m = ac.menu()
+            if m is not None:
+                m.setVisible(False)
+
         self.clear()
+        self.added_actions = []
 
         for what in actions:
             if what is None:
@@ -245,6 +252,7 @@ class ToolBar(QToolBar): # {{{
             elif what == 'Location Manager':
                 for ac in self.location_manager.available_actions:
                     self.addAction(ac)
+                    self.added_actions.append(ac)
                     self.setup_tool_button(ac, QToolButton.MenuButtonPopup)
             elif what == 'Donate':
                 self.d_widget = QWidget()
@@ -255,6 +263,7 @@ class ToolBar(QToolBar): # {{{
             elif what in self.gui.iactions:
                 action = self.gui.iactions[what]
                 self.addAction(action.qaction)
+                self.added_actions.append(action.qaction)
                 self.setup_tool_button(action.qaction, action.popup_type)
 
     def setup_tool_button(self, ac, menu_mode=None):