From d978e4918b2924cca41bdd8f6c80660a705eb1d9 Mon Sep 17 00:00:00 2001
From: Goffi <goffi@goffi.org>
Date: Mon, 7 Dec 2015 13:10:44 +0100
Subject: [PATCH] core: avoid initialisation blocking when a long callback is
 added to backend.initialised (could prevent sessions starting)

---
 src/memory/memory.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/memory/memory.py b/src/memory/memory.py
index 4b4bf432..91759144 100644
--- a/src/memory/memory.py
+++ b/src/memory/memory.py
@@ -355,7 +355,10 @@ class Memory(object):
             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