From 8e6a9ec3f519fb14319e17598800fe64315c92e1 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 4 May 2021 18:48:35 +0200
Subject: [PATCH] fix(devtools): fix devtools attach

---
 src/rootStore.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/rootStore.ts b/src/rootStore.ts
index 419615ea..b529b3a5 100644
--- a/src/rootStore.ts
+++ b/src/rootStore.ts
@@ -65,7 +65,14 @@ export const storesMap = new WeakMap<
  */
 let clientAppPromise: Promise<App> | undefined
 let resolveApp: ((app: App) => void) | undefined
-export const setClientApp = (app: App) => resolveApp && resolveApp(app)
+export const setClientApp = (app: App) => {
+  if (resolveApp) {
+    resolveApp(app)
+  } else {
+    // setClientApp might be called before getClientApp
+    clientAppPromise = Promise.resolve(app)
+  }
+}
 export const getClientApp = () =>
   clientAppPromise ||
   (clientAppPromise = new Promise((resolve) => (resolveApp = resolve)))
-- 
2.47.2