summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-12-02 14:09:05 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-12-02 14:09:05 -0300
commitbb2357fe4f6cd53ddea6cf8a999e1213c10a9c1c (patch)
tree38837aca0793efccfbb620b6416553b8e20e53db
parent160ebc8e7192443980865b3dd3150055b3f932f0 (diff)
parentc59b6ac74dc8e9054237f28f37c9f9573c9b5713 (diff)
Merge remote-tracking branch 'chiiph/bug/4632_remove_eip_stopped_message' into develop
-rw-r--r--changes/bug4632_remove_eip_stopped_message2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/changes/bug4632_remove_eip_stopped_message b/changes/bug4632_remove_eip_stopped_message
new file mode 100644
index 00000000..35836336
--- /dev/null
+++ b/changes/bug4632_remove_eip_stopped_message
@@ -0,0 +1,2 @@
+- Do not show the generic message "EIP has stopped" since it's
+ redundant. Fixes #4632. \ No newline at end of file
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 25e25e45..0d55040f 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1369,8 +1369,7 @@ class MainWindow(QtGui.QMainWindow):
Sets eip status to off
"""
# XXX this should be handled by the state machine.
- self._eip_status.set_eip_status(self.tr("EIP has stopped"),
- error=error)
+ self._eip_status.set_eip_status("", error=error)
self._eip_status.set_eip_status_icon("error")
def _eip_finished(self, exitCode):