summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-10-03 18:59:43 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-10-03 18:59:43 -0300
commitb95bbc415086c4ebdf9d0a8adc8b64a9fe3bf8b1 (patch)
tree4943a18ec37b1f6300134f0786d750c2b7d8ab11 /src/leap
parent2c2c636b4244d53f6f1ea240ee95c30a6827c243 (diff)
parent1f36c21ca532e39ef80b4a27f79bcad66ed335b2 (diff)
Merge remote-tracking branch 'chiiph/bug/allow_minimize_osx' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index dd4a341e..79ff68c4 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -766,9 +766,10 @@ class MainWindow(QtGui.QMainWindow):
"""
Reimplements the changeEvent method to minimize to tray
"""
- if QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
- e.type() == QtCore.QEvent.WindowStateChange and \
- self.isMinimized():
+ if not IS_MAC and \
+ QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
+ e.type() == QtCore.QEvent.WindowStateChange and \
+ self.isMinimized():
self._toggle_visible()
e.accept()
return