summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-22 16:58:16 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-22 16:58:16 -0300
commitdeaddb4a77acfb99024c4ca2f584210e778573ce (patch)
tree1055e11030b06d23e959cec9378e77c6fd44486f
parent9095efc3c98d043cd32a783b0bebba6baf259e55 (diff)
parent3fe586a7aad16de5401090d3d1725e58fca0ed3e (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/5559_avoid-errors-when-ctrl-c-wizard' into develop
-rw-r--r--changes/bug-5559_avoid-errors-when-ctrl-c-wizard1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py7
-rw-r--r--src/leap/bitmask/gui/twisted_main.py15
3 files changed, 11 insertions, 12 deletions
diff --git a/changes/bug-5559_avoid-errors-when-ctrl-c-wizard b/changes/bug-5559_avoid-errors-when-ctrl-c-wizard
new file mode 100644
index 00000000..36f352b8
--- /dev/null
+++ b/changes/bug-5559_avoid-errors-when-ctrl-c-wizard
@@ -0,0 +1 @@
+- Avoid user getting errors if he does a 'ctrl-c' on the wizard during the first run. Closes #5559.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 907d4ceb..e4443434 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -2046,9 +2046,10 @@ class MainWindow(QtGui.QMainWindow):
# first thing to do quitting, hide the mainwindow and show tooltip.
self.hide()
- self._systray.showMessage(
- self.tr('Quitting...'),
- self.tr('The app is quitting, please wait.'))
+ if self._systray is not None:
+ self._systray.showMessage(
+ self.tr('Quitting...'),
+ self.tr('The app is quitting, please wait.'))
# explicitly process events to display tooltip immediately
QtCore.QCoreApplication.processEvents()
diff --git a/src/leap/bitmask/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py
index ece32ca2..f39d0bbe 100644
--- a/src/leap/bitmask/gui/twisted_main.py
+++ b/src/leap/bitmask/gui/twisted_main.py
@@ -22,9 +22,6 @@ import logging
from twisted.internet import error, reactor
from PySide import QtCore
-# Resist the temptation of putting the import reactor here,
-# it will raise an "reactor already imported" error.
-
logger = logging.getLogger(__name__)
@@ -32,7 +29,11 @@ def stop():
logger.debug("Really stoping all the things...")
QtCore.QCoreApplication.sendPostedEvents()
QtCore.QCoreApplication.flush()
- reactor.stop()
+ try:
+ reactor.stop()
+ logger.debug('Twisted reactor stopped')
+ except error.ReactorNotRunning:
+ logger.debug('Twisted reactor not running')
logger.debug("Done stopping all the things.")
@@ -43,8 +44,4 @@ def quit(app):
:param app: the main qt QApplication instance.
:type app: QtCore.QApplication
"""
- logger.debug('Stopping twisted reactor')
- try:
- reactor.callLater(0, stop)
- except error.ReactorNotRunning:
- logger.debug('Reactor not running')
+ reactor.callLater(0, stop)