diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-13 11:48:06 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-13 11:48:06 -0300 |
| commit | 143a08dd1cc8eeb9d92a1d981f8a13fb3e4c966d (patch) | |
| tree | aaf62134ec529a2348b92f0c01d2a78f052418cf | |
| parent | b4511cdad95f8cbfa21f266addd215a8a6ff36d0 (diff) | |
| parent | 7cacae6d4bd742cfb1f994e5093a939a594884d9 (diff) | |
Merge remote-tracking branch 'chiiph/bug/3406_quit_hangs' into develop
| -rw-r--r-- | changes/bug_3406_quit_hangs | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/twisted_main.py | 6 |
2 files changed, 5 insertions, 3 deletions
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') |