summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-06-04 10:11:46 -0500
committerKali Kaneko <kali@leap.se>2014-06-04 14:01:48 -0500
commit0626d6349472bdcd934328165cfe1a0e7d891bfe (patch)
treef96d28de642e15c67fe9cf39db4a7705501a8a89 /src/leap/bitmask/gui
parentaeb89d2c64f8925d5063149e718ec2d97248b7c4 (diff)
catch openvpn unexpected ending
show also the back-to-clearnet button on that case.
Diffstat (limited to 'src/leap/bitmask/gui')
-rw-r--r--src/leap/bitmask/gui/eip_status.py5
-rw-r--r--src/leap/bitmask/gui/mainwindow.py1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/eip_status.py b/src/leap/bitmask/gui/eip_status.py
index fd8b35c3..7649f840 100644
--- a/src/leap/bitmask/gui/eip_status.py
+++ b/src/leap/bitmask/gui/eip_status.py
@@ -400,6 +400,11 @@ class EIPStatusWidget(QtGui.QWidget):
self.eip_conductor._backend.tear_fw_down()
QtDelayedCall(50, self.hide_fw_down_button)
+ # XXX do actual check
+ msg = "Traffic is being routed in the clear."
+ self.set_eip_message(msg)
+ self.set_eip_status("")
+
@QtCore.Slot(dict)
def eip_stopped(self, restart=False, failed=False):
"""
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index e7406106..968e5ead 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1564,6 +1564,7 @@ class MainWindow(QtGui.QMainWindow):
if should_start and not self._already_started_eip:
# XXX this should be handled by the state machine.
+ self._enable_eip_start_action()
self._eip_status.set_eip_status(
self.tr("Starting..."))
self._eip_status.eip_button.setEnabled(False)