summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-07 20:08:44 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-07 20:08:44 -0300
commit399d1874fb86e72600d396cdbc64b2209eee96a0 (patch)
treec0f24450b9225110bd092794c05a004cf1b3c59d /src/leap/bitmask/gui/mainwindow.py
parent430cb6d98ca230db28c1509977307679fb0bf767 (diff)
parent17fcf4f3efd1c016bd0f93129b4bedfd8ca92309 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/better-soledad-retry' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
1 files changed, 1 insertions, 2 deletions
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.")