diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-02 13:19:29 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-02 13:19:29 -0400 |
| commit | ae72f363e10a147e8d8d9cb5555bc2a42bb74e44 (patch) | |
| tree | 3b774fe458c438021f6d932c7002611baf0e8b31 | |
| parent | bb2357fe4f6cd53ddea6cf8a999e1213c10a9c1c (diff) | |
| parent | a9765e721f210301ce06da3d8bccb4fc1a275834 (diff) | |
Merge remote-tracking branch 'chiiph/bug/4504_properly_close_soledad' into develop
| -rw-r--r-- | changes/bug_4504_properly_close_soledad | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changes/bug_4504_properly_close_soledad b/changes/bug_4504_properly_close_soledad new file mode 100644 index 00000000..b33db9c2 --- /dev/null +++ b/changes/bug_4504_properly_close_soledad @@ -0,0 +1 @@ +- Properly close Soledad at quit time. Fixes #4504.
\ No newline at end of file diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 0d55040f..36d3ca67 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1651,9 +1651,9 @@ class MainWindow(QtGui.QMainWindow): # XXX this can timeout after loong time: See #3368 self._srp_auth.logout() - if self._soledad: + if self._soledad_bootstrapper.soledad is not None: logger.debug("Closing soledad...") - self._soledad.close() + self._soledad_bootstrapper.soledad.close() else: logger.error("No instance of soledad was found.") |