Added a 60 second timeout to the reactor thread join on shutdown

467a4b26 · Saul Ibarra · 8dd18466 · 467a4b26
Commit 467a4b26 authored Aug 13, 2010 by Saul Ibarra
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

__init__.py blink/__init__.py +2 -1

No files found.
--- a/blink/__init__.py
+++ b/blink/__init__.py
@@ -88,7 +88,8 @@ class Blink(QApplication):
        self.exec_()
        self.update_manager.shutdown()
        self.application.stop()
-        self.application.thread.join()
+        # TODO: timeout should be removed when the Engine is fixed so that it never hangs. -Saul
+        self.application.thread.join(60.0)
        log_manager = LogManager()
        log_manager.stop()