Merge pull request #682 from campagnola/qapp-fix

Fix: mkQApp returned None if a QApplication was already created elsewhere
2018-05-04 14:05:12 -07:00 · 2018-05-04 14:05:12 -07:00 · 3ffd7dbb97
commit 3ffd7dbb97
parent 120d49b0f3 11463c5a0b
1 changed files with 3 additions and 2 deletions
--- a/pyqtgraph/Qt.py
+++ b/pyqtgraph/Qt.py
@ -276,7 +276,8 @@ if m is not None and list(map(int, m.groups())) < versionReq:

 QAPP = None
 def mkQApp():
-    global QAPP
-    if QtGui.QApplication.instance() is None:
+    global QAPP    
+    QAPP = QtGui.QApplication.instance()
+    if QAPP is None:
        QAPP = QtGui.QApplication([])
    return QAPP