Cleanup in generating list of players in gui

Syncplay · Nov 14, 2013 · b60c73f · b60c73f
1 parent 9a7d2c1
commit b60c73f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
@@ -73,7 +73,9 @@ def _tryToFillPlayerPath(self, playerpath, playerpathlist):
         settings = QSettings("Syncplay", "PlayerList")
         settings.beginGroup("PlayerList")
         savedPlayers = settings.value("PlayerList", [])
-        playerpathlist = list(set([os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist + savedPlayers)]))
+        if(not isinstance(savedPlayers, list)):
+            savedPlayers = []
+        playerpathlist = list(set(os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist + savedPlayers)))
         settings.endGroup()
         foundpath = ""
 
@@ -96,7 +98,7 @@ def _tryToFillPlayerPath(self, playerpath, playerpathlist):
         if foundpath != "":
             settings.beginGroup("PlayerList")
             playerpathlist.append(os.path.normcase(os.path.normpath(foundpath)))
-            settings.setValue("PlayerList",  list(set([os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist)])))
+            settings.setValue("PlayerList",  list(set(os.path.normcase(os.path.normpath(path)) for path in set(playerpathlist))))
             settings.endGroup()
         return(foundpath)
 
@@ -335,7 +337,7 @@ def __init__(self, config, playerpaths, error):
         self.executablepathCombobox = QtGui.QComboBox(self)
         self.executablepathCombobox.setEditable(True)
         self.executablepathCombobox.currentIndexChanged.connect(self.updateExecutableIcon)
-        self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'],playerpaths))
+        self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'], playerpaths))
         self.executablepathCombobox.setMinimumWidth(200)
         self.executablepathCombobox.setMaximumWidth(200)
         self.executablepathCombobox.editTextChanged.connect(self.updateExecutableIcon)