Merge 83950df7ac08ce823ee1354f7ea0a1dfe2f6769f into 9752aad75db1c7a705a5e0d6dfda8737620aa0ec

This commit is contained in:
DerGenaue 2015-10-26 20:30:31 +00:00
commit 1bcdba3381

View File

@ -291,6 +291,7 @@ class ConfigDialog(QtGui.QDialog):
self.processWidget(self, lambda w: self.saveValues(w)) self.processWidget(self, lambda w: self.saveValues(w))
if self.hostCombobox.currentText(): if self.hostCombobox.currentText():
self.config['host'] = self.hostCombobox.currentText() if ":" in self.hostCombobox.currentText() else self.hostCombobox.currentText() + ":" + unicode(constants.DEFAULT_PORT) self.config['host'] = self.hostCombobox.currentText() if ":" in self.hostCombobox.currentText() else self.hostCombobox.currentText() + ":" + unicode(constants.DEFAULT_PORT)
self.config['host'] = self.config['host'].translate(None, " \t\n\r")
else: else:
self.config['host'] = None self.config['host'] = None
self.config['playerPath'] = unicode(self.safenormcaseandpath(self.executablepathCombobox.currentText())) self.config['playerPath'] = unicode(self.safenormcaseandpath(self.executablepathCombobox.currentText()))
@ -996,4 +997,4 @@ class ConfigDialog(QtGui.QDialog):
self.processWidget(self, lambda w: self.loadTooltips(w)) self.processWidget(self, lambda w: self.loadTooltips(w))
self.processWidget(self, lambda w: self.loadValues(w)) self.processWidget(self, lambda w: self.loadValues(w))
self.processWidget(self, lambda w: self.connectChildren(w)) self.processWidget(self, lambda w: self.connectChildren(w))
self.populateEmptyServerList() self.populateEmptyServerList()