From c925515249a7ea753c074cfc826fd89b5fe94a95 Mon Sep 17 00:00:00 2001 From: Uriziel Date: Sat, 8 Jun 2013 13:28:11 +0200 Subject: [PATCH] GUI starts properly when ConfigurationWindow wasn't executed --- syncplay/ui/ConfigurationGetter.py | 4 ++++ syncplay/ui/GuiConfiguration.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index eb2e33e..0a29827 100644 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -8,6 +8,8 @@ from syncplay.players.playerFactory import PlayerFactory import codecs try: from syncplay.ui.GuiConfiguration import GuiConfiguration + from PySide import QtGui #@UnresolvedImport + from PySide.QtCore import Qt, QCoreApplication except ImportError: GuiConfiguration = None @@ -243,6 +245,8 @@ class ConfigurationGetter(object): self._loadRelativeConfiguration() if(not self._config['noGui']): from syncplay.vendor import qt4reactor + if QCoreApplication.instance() is None: + self.app = QtGui.QApplication(sys.argv) qt4reactor.install() return self._config diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 4f4ee0e..304525f 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -1,5 +1,5 @@ from PySide import QtCore, QtGui -from PySide.QtCore import QSettings, Qt +from PySide.QtCore import QSettings, Qt, QCoreApplication from PySide.QtGui import QApplication, QLineEdit, QCursor, QLabel, QCheckBox, QDesktopServices, QIcon import os @@ -12,7 +12,8 @@ class GuiConfiguration: self._availablePlayerPaths = [] def run(self): - self.app = QtGui.QApplication(sys.argv) + if QCoreApplication.instance() is None: + self.app = QtGui.QApplication(sys.argv) dialog = ConfigDialog(self.config, self._availablePlayerPaths) dialog.exec_()