diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-07-24 18:02:16 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-07-24 18:02:16 -0300 |
| commit | ae88e706d9d43136a9d851b391efd3922d1a8667 (patch) | |
| tree | 4f290e78011fe7ba56029e2abc23811aa3b75fe4 | |
| parent | ceb912a38ba80fd6986e9e678077a86664fea920 (diff) | |
| parent | 59f97e46c85e7727aa9b5e87da5c419d428a00c8 (diff) | |
Merge remote-tracking branch 'chiiph/bug/always_logout' into develop
| -rw-r--r-- | changes/bug_always_logout | 2 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug_always_logout b/changes/bug_always_logout new file mode 100644 index 00000000..eb2c2817 --- /dev/null +++ b/changes/bug_always_logout @@ -0,0 +1,2 @@ + o Always logout when closing the app if the user previously signed + in. Fixes #3245.
\ No newline at end of file diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 3bd7c516..baa5f385 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -1348,6 +1348,11 @@ class MainWindow(QtGui.QMainWindow): """ logger.debug('About to quit, doing cleanup...') + if self._srp_auth is not None: + if self._srp_auth.get_session_id() is not None or \ + self._srp_auth.get_token() is not None: + self._srp_auth.logout() + logger.debug('Cleaning pidfiles') self._cleanup_pidfiles() |