diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-22 11:13:34 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-22 11:13:34 -0300 |
| commit | bafcfbbfb571f537c0c621f6ea0eba7e183522a2 (patch) | |
| tree | f11b4393fb87664b3fed308ca5b304fde28d9299 /src/leap/bitmask/gui | |
| parent | e7cff9866e50f9730f8fc6ab70cf116ed38f7935 (diff) | |
| parent | f4ed7d8ab4401f6ef310118b037bc982ae73b75c (diff) | |
Merge remote-tracking branch 'refs/remotes/kali/bug/fw-on-restart' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 8 |
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): |