diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-28 16:49:44 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-08-01 13:57:54 -0300 |
| commit | 7e1d8b4f66577fb9f4775f16fffd02bc4ae57100 (patch) | |
| tree | d757cd2c36dad65ea2c7e45d5998930ad6ac265b | |
| parent | 19b74b597bd4d33bb3ea7f95fd4fffcadf372ccd (diff) | |
Do `quit()` if the system requested the app to close.
This fixes the issue where a system logout was blocked by bitmask since
we were interpreting the closeEvent as if the user clicked on the 'X'
button.
Closes #5870.
| -rw-r--r-- | changes/5870_bitmask-prevent-system-logout-on-linux | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 5 |
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() |