Another attempt at fixing the shutdown problem

torusJKL · Jan 31, 2012 · fa90b2d · fa90b2d
1 parent 9aa62f4
commit fa90b2d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/ArmoryQt.py b/ArmoryQt.py
@@ -1524,6 +1524,8 @@ def closeEvent(self, event=None):
 
    from twisted.internet import reactor
    def endProgram():
+      if reactor.threadpool is not None:
+         reactor.threadpool.stop()
       app.quit()
       try:
          sys.exit()
@@ -1534,6 +1536,8 @@ def endProgram():
    if form.abortLoad:
       endProgram()
 
+   app.connect(form, SIGNAL("lastWindowClosed()"), endProgram)
+   reactor.addSystemEventTrigger('before', 'shutdown', endProgram)
    app.setQuitOnLastWindowClosed(True)
    reactor.runReturn()
    sys.exit(app.exec_())