summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-08-13 11:48:06 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-08-13 11:48:06 -0300
commit143a08dd1cc8eeb9d92a1d981f8a13fb3e4c966d (patch)
treeaaf62134ec529a2348b92f0c01d2a78f052418cf /src/leap
parentb4511cdad95f8cbfa21f266addd215a8a6ff36d0 (diff)
parent7cacae6d4bd742cfb1f994e5093a939a594884d9 (diff)
Merge remote-tracking branch 'chiiph/bug/3406_quit_hangs' into develop
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/twisted_main.py6
1 files changed, 3 insertions, 3 deletions
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')