summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug-5995_save-provider-on-change1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py8
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/bug-5995_save-provider-on-change b/changes/bug-5995_save-provider-on-change
new file mode 100644
index 00000000..e0f86d75
--- /dev/null
+++ b/changes/bug-5995_save-provider-on-change
@@ -0,0 +1 @@
+- Save default provider if changed on the combo box. Closes #5995.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 70a3f388..60605b48 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1249,9 +1249,14 @@ 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)
return
title = self.tr("Stop services")
@@ -1269,6 +1274,9 @@ 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._eip_conductor.qtsigs.do_disconnect_signal.emit()
if wizard: