From 7cacae6d4bd742cfb1f994e5093a939a594884d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Tue, 13 Aug 2013 11:38:14 -0300 Subject: Stop the reactor by adding the stop to the call chain --- changes/bug_3406_quit_hangs | 2 ++ src/leap/bitmask/gui/twisted_main.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 changes/bug_3406_quit_hangs diff --git a/changes/bug_3406_quit_hangs b/changes/bug_3406_quit_hangs new file mode 100644 index 00000000..77452780 --- /dev/null +++ b/changes/bug_3406_quit_hangs @@ -0,0 +1,2 @@ + o Stop the twisted reactor adding the stop call to the call chain + instead of stopping it directly. Fixes #3406. \ No newline at end of file diff --git a/src/leap/bitmask/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py index c7add3ee..e11af7bd 100644 --- a/src/leap/bitmask/gui/twisted_main.py +++ b/src/leap/bitmask/gui/twisted_main.py @@ -53,8 +53,8 @@ def quit(app): :type app: QtCore.QApplication """ from twisted.internet import reactor - logger.debug('stopping twisted reactor') + logger.debug('Stopping twisted reactor') try: - reactor.stop() + reactor.callLater(0, reactor.stop) except error.ReactorNotRunning: - logger.debug('reactor not running') + logger.debug('Reactor not running') -- cgit v1.2.3