summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-16 17:17:17 -0400
committerKali Kaneko <kali@leap.se>2013-09-16 17:17:17 -0400
commite475daff20a2278ad170cb1ebaf528e7ee4a1657 (patch)
treedfb39172819ea7b711152cc1bff5a02efd5de5c7
parent2f4b4b32884319550af79526bd73ab2afa07b670 (diff)
parent91f01388246d05001f241c7c5def095557e835d1 (diff)
Merge remote-tracking branch 'ivan-github/bug/3821_inconsistent-hide-show' into develop
-rw-r--r--changes/bug-3821_inconsistent-hide-show-mainwindow1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug-3821_inconsistent-hide-show-mainwindow b/changes/bug-3821_inconsistent-hide-show-mainwindow
new file mode 100644
index 00000000..3fb05a85
--- /dev/null
+++ b/changes/bug-3821_inconsistent-hide-show-mainwindow
@@ -0,0 +1 @@
+ o Inconsistent hide/show main window from tray action. Closes #3821.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 2942d4c8..98cfacb1 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -696,7 +696,9 @@ class MainWindow(QtGui.QMainWindow):
qApp.setQuitOnLastWindowClosed(False)
self.hide()
- self._update_hideshow_menu()
+ # Wait a bit until the window visibility has changed so
+ # the menu is set with the correct value.
+ QtCore.QTimer.singleShot(500, self._update_hideshow_menu)
def _center_window(self):
"""