summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug-5411_mail-is-not-disabled-at-first-start1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug-5411_mail-is-not-disabled-at-first-start b/changes/bug-5411_mail-is-not-disabled-at-first-start
new file mode 100644
index 00000000..3cba7a01
--- /dev/null
+++ b/changes/bug-5411_mail-is-not-disabled-at-first-start
@@ -0,0 +1 @@
+- Do not start soledad and mail if the mail service is disabled. Closes #5411.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index feb1e18b..04a98fac 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1230,6 +1230,9 @@ class MainWindow(QtGui.QMainWindow):
if self._already_started_soledad is True:
return
+ if not self._provides_mx_and_enabled():
+ return
+
username = self._login_widget.get_user()
password = unicode(self._login_widget.get_password())
provider_domain = self._login_widget.get_selected_provider()