From 715b50b872736952d01b2c8cac9003da1e634c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 13 Mar 2013 14:24:05 -0300
Subject: Make sure we always end up with the proper list of services

---
 src/leap/gui/mainwindow.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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"))
-- 
cgit v1.2.3