Skip to content

Fix bug arising from PyQt4 where QtGui.qApp is not initialized to None #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
quornian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bug arising from PyQt4 where QtGui.qApp is not initialized to None #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a6f68
Fix bug arising from PyQt4 where QtGui.qApp is not initialized to None
quornian Mar 28, 2017
06bdd01
Merge branch 'master' into master
quornian Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def has_ui(self):
# a QApplication has been created.
if self._has_qt:
from tank.platform.qt import QtGui
return QtGui.qApp is not None
return QtGui.QApplication.instance() is not None
else:
return False

Expand Down Expand Up @@ -129,7 +129,7 @@ def execute_command(self, cmd_key, args):

# start up our QApp now, if none is already running
qt_application = None
if not QtGui.qApp:
if not QtGui.QApplication.instance():
QtGui.QApplication.setLibraryPaths([])
qt_application = QtGui.QApplication([])
qt_application.setWindowIcon(QtGui.QIcon(self.icon_256))
Expand Down