Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix crash when closing after promptForMissingArguments in GuiConfig

Browse Source
This commit is contained in:
Et0h 2016-07-03 11:22:56 +01:00
parent fc67011bd9
commit a1c81b1768
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
syncplay/ui/GuiConfiguration.py
View File

@ -67,7 +67,7 @@ class GetPlayerIconThread(threading.Thread, QtCore.QObject):
class ConfigDialog(QtGui.QDialog): class ConfigDialog(QtGui.QDialog):
pressedclosebutton = False pressedclosebutton = True
moreToggling = False moreToggling = False
def automaticUpdatePromptCheck(self): def automaticUpdatePromptCheck(self):
@ -360,10 +360,10 @@ class ConfigDialog(QtGui.QDialog):
self.saveMediaBrowseSettings() self.saveMediaBrowseSettings()
def _runWithoutStoringConfig(self): def _runWithoutStoringConfig(self):
self._saveDataAndLeave(storeConfiguration=False) self._saveDataAndLeave(False)
def _saveDataAndLeave(self, storeConfiguration=True): def _saveDataAndLeave(self, storeConfiguration=True):
self.config['noStore'] = storeConfiguration self.config['noStore'] = not storeConfiguration
if storeConfiguration: if storeConfiguration:
self.automaticUpdatePromptCheck() self.automaticUpdatePromptCheck()
self.loadLastUpdateCheckDate() self.loadLastUpdateCheckDate()
@ -387,12 +387,13 @@ class ConfigDialog(QtGui.QDialog):
else: else:
self.config['file'] = unicode(self.mediapathTextbox.text()) self.config['file'] = unicode(self.mediapathTextbox.text())
self.pressedclosebutton = True self.pressedclosebutton = False
self.close() self.close()
return return
def closeEvent(self, event): def closeEvent(self, event):
if self.pressedclosebutton == False: if self.pressedclosebutton:
super(ConfigDialog, self).closeEvent(event)
sys.exit() sys.exit()
def keyPressEvent(self, event): def keyPressEvent(self, event):
@ -926,10 +927,10 @@ class ConfigDialog(QtGui.QDialog):
self.resetButton.pressed.connect(self.resetSettings) self.resetButton.pressed.connect(self.resetSettings)
self.runButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + u'accept.png'), getMessage("run-label")) self.runButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + u'accept.png'), getMessage("run-label"))
self.runButton.pressed.connect(self._saveDataAndLeave) self.runButton.pressed.connect(self._runWithoutStoringConfig)
self.runButton.setToolTip(getMessage("nostore-tooltip")) self.runButton.setToolTip(getMessage("nostore-tooltip"))
self.storeAndRunButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + u'accept.png'), getMessage("storeandrun-label")) self.storeAndRunButton = QtGui.QPushButton(QtGui.QIcon(resourcespath + u'accept.png'), getMessage("storeandrun-label"))
self.storeAndRunButton.pressed.connect(self._runWithoutStoringConfig) self.storeAndRunButton.pressed.connect(self._saveDataAndLeave)
self.bottomButtonLayout.addWidget(self.helpButton) self.bottomButtonLayout.addWidget(self.helpButton)
self.bottomButtonLayout.addWidget(self.resetButton) self.bottomButtonLayout.addWidget(self.resetButton)
self.bottomButtonLayout.addWidget(self.runButton) self.bottomButtonLayout.addWidget(self.runButton)
@ -983,7 +984,7 @@ class ConfigDialog(QtGui.QDialog):
def resetSettings(self): def resetSettings(self):
self.clearGUIData(leaveMore=True) self.clearGUIData(leaveMore=True)
self.config['resetConfig'] = True self.config['resetConfig'] = True
self.pressedclosebutton = True self.pressedclosebutton = False
self.close() self.close()
def showEvent(self, *args, **kwargs): def showEvent(self, *args, **kwargs):