summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-13 14:24:05 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-13 14:24:05 -0300
commit715b50b872736952d01b2c8cac9003da1e634c05 (patch)
tree4bf4dd6386706383fd71c569d1679e81fc268b41 /src/leap/gui
parent4459619c0d0597447119c67fb7267caae028103f (diff)
Make sure we always end up with the proper list of services
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 9589bea0..af905fc0 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -508,7 +508,10 @@ class MainWindow(QtGui.QMainWindow):
settings = QtCore.QSettings()
self._enabled_services = settings.value(
"%s/Services" %
- (self.ui.cmbProviders.currentText(),), "").split(",")
+ (self.ui.cmbProviders.currentText(),), "")
+
+ if isinstance(self._enabled_services, (str, unicode)):
+ self._enabled_services = self._enabled_services.split(",")
if len(provider) == 0:
self._set_status(self.tr("Please select a valid provider"))