Properly shutdown soledad instance.

1 files changed, 10 insertions, 2 deletions

diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index bf959d05..ed0d4652 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -910,8 +910,8 @@ class MainWindow(QtGui.QMainWindow):
             # TODO: display in the GUI:
             # should pass signal to a slot in status_panel
             # that sets the global status
-            logger.error("Soledad failed to start: %s" %
-                         (data[self._soledad_bootstrapper.ERROR_KEY],))
+            logger.warning("Soledad failed to start: %s" %
+                           (data[self._soledad_bootstrapper.ERROR_KEY],))
 
     def _soledad_bootstrapped_stage(self, data):
         """
@@ -1381,8 +1381,15 @@ class MainWindow(QtGui.QMainWindow):
         if self._srp_auth is not None:
             if self._srp_auth.get_session_id() is not None or \
                self._srp_auth.get_token() is not None:
+                # XXX this can timeout after loong time: See #3368
                 self._srp_auth.logout()
 
+        if self._soledad:
+            logger.debug("Closing soledad...")
+            self._soledad.close()
+        else:
+            logger.error("No instance of soledad was found.")
+
         logger.debug('Cleaning pidfiles')
         self._cleanup_pidfiles()
 
@@ -1396,6 +1403,7 @@ class MainWindow(QtGui.QMainWindow):
         self._cleanup_and_quit()
 
         self._really_quit = True
+
         if self._wizard:
             self._wizard.close()