diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-06-11 17:35:36 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-06-11 17:35:36 -0300 |
| commit | e46ef1d51d2b401bfeafd692e18158f787531459 (patch) | |
| tree | 9d49c712166157c64f65fdbde795c308862095c4 | |
| parent | 51f19022d304d527faff84bf57edb0dec45216fe (diff) | |
| parent | b2653dcf8f9619c73e4fc792a2d952dd2fdfd3b4 (diff) | |
Merge remote-tracking branch 'ivan/feature/2795_logout-should-not-disconnect-vpn' into develop
| -rw-r--r-- | changes/feature_2795-logout_should_not_disconnect_vpn | 1 | ||||
| -rw-r--r-- | src/leap/gui/mainwindow.py | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/changes/feature_2795-logout_should_not_disconnect_vpn b/changes/feature_2795-logout_should_not_disconnect_vpn new file mode 100644 index 00000000..ddb68d86 --- /dev/null +++ b/changes/feature_2795-logout_should_not_disconnect_vpn @@ -0,0 +1 @@ + o Disable vpn disconnect on logout, closes #2795. diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index a7d88aee..afa7e947 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -1084,8 +1084,6 @@ class MainWindow(QtGui.QMainWindow): Starts the logout sequence """ - self._set_eip_status_icon("error") - self._set_eip_status(self.tr("Signing out...")) # XXX: If other defers are doing authenticated stuff, this # might conflict with those. CHECK! threads.deferToThread(self._srp_auth.logout) @@ -1103,7 +1101,6 @@ class MainWindow(QtGui.QMainWindow): self.ui.lnPassword.setText("") self._login_set_enabled(True) self._set_status("") - self._vpn.terminate() def _intermediate_stage(self, data): """ |