summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-24 12:54:06 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-24 12:54:49 -0300
commitd97a9804c1a6fb06d7ce39066f92a0259a6ab8c3 (patch)
tree873a5bfc80dff308abc8b09091adab41c761e1c6
parentaeacb80a34dc7b8996278e35e9cc888d93e2f853 (diff)
Don't call the backend if it's not online.
-rw-r--r--src/leap/bitmask/gui/mainwindow.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 59a65b1e..ff19e17f 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1813,10 +1813,14 @@ class MainWindow(QtGui.QMainWindow):
# Set this in case that the app is hidden
QtGui.QApplication.setQuitOnLastWindowClosed(True)
- self._stop_services()
-
self._really_quit = True
+ if not self._backend.online:
+ self.final_quit()
+ return
+
+ self._stop_services()
+
# call final quit when all the services are stopped
self.all_services_stopped.connect(self.final_quit)
# or if we reach the timeout
@@ -1859,11 +1863,12 @@ class MainWindow(QtGui.QMainWindow):
if self._finally_quitting:
return
+ logger.debug('Final quit...')
self._finally_quitting = True
- logger.debug('Closing soledad...')
- self._backend.soledad_close()
- logger.debug('Final quit...')
+ if self._backend.online:
+ logger.debug('Closing soledad...')
+ self._backend.soledad_close()
self._leap_signaler.stop()