summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/better-soledad-retry1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/better-soledad-retry b/changes/better-soledad-retry
new file mode 100644
index 00000000..ac21f76c
--- /dev/null
+++ b/changes/better-soledad-retry
@@ -0,0 +1 @@
+In case of soledad bootstrap error (e.g.: network failure), re run all the setup process.
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 13e289fb..7b2592a9 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1248,8 +1248,7 @@ class MainWindow(QtGui.QMainWindow):
self._soledad_bootstrapper.increment_retries_count()
# XXX should cancel the existing socket --- this
# is avoiding a clean termination.
- threads.deferToThread(
- self._soledad_bootstrapper.load_and_sync_soledad)
+ self._maybe_run_soledad_setup_checks()
else:
logger.warning("Max number of soledad initialization "
"retries reached.")