Merge remote-tracking branch 'chiiph/bug/dont_start_if_stopped' into develop

2 files changed, 6 insertions, 3 deletions

diff --git a/src/leap/config/leapsettings.py b/src/leap/config/leapsettings.py
index 88b7d8c9..35010280 100644
--- a/src/leap/config/leapsettings.py
+++ b/src/leap/config/leapsettings.py
@@ -227,10 +227,12 @@ class LeapSettings(object):
         Sets the default provider to be used for autostarting EIP
 
         :param provider: provider to use
-        :type provider: str
+        :type provider: str or None
         """
-        leap_assert(len(provider) > 0, "We cannot save an empty provider")
-        self._settings.setValue(self.DEFAULTPROVIDER_KEY, provider)
+        if provider is None:
+            self._settings.remove(self.DEFAULTPROVIDER_KEY)
+        else:
+            self._settings.setValue(self.DEFAULTPROVIDER_KEY, provider)
 
     def get_alert_missing_scripts(self):
         """
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 67fe34e3..86f552ce 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -1004,6 +1004,7 @@ class MainWindow(QtGui.QMainWindow):
         self._action_eip_startstop.triggered.connect(
             self._start_eip)
         self._already_started_eip = False
+        self._settings.set_defaultprovider(None)
 
     def _get_best_provider_config(self):
         """