summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-20 11:31:02 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-20 11:31:02 -0300
commit20122b32ad799cf93d88c86c67d52cc7004d6af8 (patch)
treebfba3f01166de1b2ffc2e796f23356ed658240ae /src/leap
parent87304c2858fc7b560e3a89450d8b31e12202f713 (diff)
parentced7ebf5407c23c3af585db4e0749c311114272f (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/provider-switch-fixes' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 70a3f388..59896bbb 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1249,9 +1249,15 @@ class MainWindow(QtGui.QMainWindow):
# TODO: we need to add a check for the mail status (smtp/imap/soledad)
something_runing = (self._logged_user is not None or
self._already_started_eip)
+ provider = self._providers.get_selected_provider()
+
if not something_runing:
if wizard:
self._launch_wizard()
+ else:
+ self._settings.set_provider(provider)
+ self._settings.set_defaultprovider(provider)
+ self._update_eip_enabled_status()
return
title = self.tr("Stop services")
@@ -1269,7 +1275,11 @@ class MainWindow(QtGui.QMainWindow):
res = msg.exec_()
if res == QtGui.QMessageBox.Yes:
+ self._settings.set_provider(provider)
+ self._settings.set_defaultprovider(provider)
+ self._settings.set_autostart_eip(False)
self._stop_services()
+ self._update_eip_enabled_status()
self._eip_conductor.qtsigs.do_disconnect_signal.emit()
if wizard:
self._launch_wizard()