# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1449490244 -3600
# Node ID 5632c53502963d6d2eb7e078ebada8d2cfe7945e
# Parent  4308bca92922ae4660906484846b2a1ef9ba08cf
core: avoid initialisation blocking when a long callback is added to backend.initialised (could prevent sessions starting)

diff -r 4308bca92922 -r 5632c5350296 src/memory/memory.py
--- a/src/memory/memory.py	Mon Dec 07 13:10:44 2015 +0100
+++ b/src/memory/memory.py	Mon Dec 07 13:10:44 2015 +0100
@@ -355,7 +355,10 @@
             auth_d.addCallback(doStartSession)
             return auth_d
 
-        return self.host.initialised.addCallback(backendInitialised)
+        if self.host.initialised.called:
+            return defer.succeed(None).addCallback(backendInitialised)
+        else:
+            return self.host.initialised.addCallback(backendInitialised)
 
     def stopSession(self, profile):
         """Delete a profile session