summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/5870_bitmask-prevent-system-logout-on-linux1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py5
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/5870_bitmask-prevent-system-logout-on-linux b/changes/5870_bitmask-prevent-system-logout-on-linux
new file mode 100644
index 00000000..6feba46c
--- /dev/null
+++ b/changes/5870_bitmask-prevent-system-logout-on-linux
@@ -0,0 +1 @@
+- Bitmask on linux prevents session logout. Closes #5870.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 943e92ea..0bcbc1d1 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1099,6 +1099,11 @@ class MainWindow(QtGui.QMainWindow):
"""
Reimplementation of closeEvent to close to tray
"""
+ if not e.spontaneous():
+ # if the system requested the `close` then we should quit.
+ self.quit()
+ return
+
if QtGui.QSystemTrayIcon.isSystemTrayAvailable() and \
not self._really_quit:
self._toggle_visible()