summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-05-07 15:42:56 -0500
committerKali Kaneko <kali@leap.se>2014-05-12 11:25:19 -0500
commitca0e9b85a831f716a0959c5fdb9dbb571515de97 (patch)
tree9b97c81873a767a72e82c147541815d4f4a1bfe5 /src/leap/bitmask/gui
parent14b208105a6417aefd351f5b38f33bb89358ddcd (diff)
tear down fw on quit-action too
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py5
-rw-r--r--src/leap/bitmask/gui/twisted_main.py1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index a5c81983..70fad204 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -19,6 +19,7 @@ Main window for Bitmask.
"""
import logging
import socket
+import time
from threading import Condition
from datetime import datetime
@@ -2067,6 +2068,10 @@ class MainWindow(QtGui.QMainWindow):
logger.debug('Terminating vpn')
self._backend.stop_eip(shutdown=True)
+ # XXX this *has* to block, since we have some delay in vpn.terminate
+ # it should receive a signal from backend that everything is clear to
+ # proceed, or timeout happened.
+
self._cancel_ongoing_defers()
# TODO missing any more cancels?
diff --git a/src/leap/bitmask/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py
index f39d0bbe..dfd69033 100644
--- a/src/leap/bitmask/gui/twisted_main.py
+++ b/src/leap/bitmask/gui/twisted_main.py
@@ -26,7 +26,6 @@ logger = logging.getLogger(__name__)
def stop():
- logger.debug("Really stoping all the things...")
QtCore.QCoreApplication.sendPostedEvents()
QtCore.QCoreApplication.flush()
try: