diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-04-02 16:29:29 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-04-02 17:06:51 -0300 |
| commit | 469a056387fa1d69dd14f0680fa0026e0a3ff80c (patch) | |
| tree | 94ee8d3d9c69cf7c0446d077c33820a248468a7e | |
| parent | 962dbc30fd97176b30eac9df75e8ad1697972bf2 (diff) | |
Do not start soledad if its not provided and enabled.
[Closes #5411]
| -rw-r--r-- | changes/bug-5411_mail-is-not-disabled-at-first-start | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 3 |
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() |