summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-05-19 11:11:31 -0500
committerKali Kaneko <kali@leap.se>2014-05-21 18:38:23 -0500
commit100848992f96f8edd32433dd8f5efc7dc1230079 (patch)
tree6df4d7aedc7735c94b08eb0d463e3f633fc6cae4 /src/leap/bitmask/gui
parente7cff9866e50f9730f8fc6ab70cf116ed38f7935 (diff)
do not tear fw down during restarts
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index fc4b4d75..201a24ec 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1680,7 +1680,7 @@ class MainWindow(QtGui.QMainWindow):
self._set_eipstatus_off()
@QtCore.Slot()
- def _stop_eip(self):
+ def _stop_eip(self, restart=False):
"""
TRIGGERS:
self._eip_connection.qtsigs.do_disconnect_signal (via state machine)
@@ -1691,8 +1691,8 @@ class MainWindow(QtGui.QMainWindow):
:param abnormal: whether this was an abnormal termination.
:type abnormal: bool
"""
- self.user_stopped_eip = True
- self._backend.eip_stop()
+ self.user_stopped_eip = not restart
+ self._backend.eip_stop(restart=restart)
self._set_eipstatus_off(False)
self._already_started_eip = False
@@ -1731,7 +1731,7 @@ class MainWindow(QtGui.QMainWindow):
"""
# for some reason, emitting the do_disconnect/do_connect
# signals hangs the UI.
- self._stop_eip()
+ self._stop_eip(restart=True)
QtCore.QTimer.singleShot(2000, self._start_EIP)
def _set_eipstatus_off(self, error=True):