Fix race condition of live pending operation

CompuIves · CompuIves · commit 38720e945fb3 · 2020-02-06T16:51:16.000+01:00
diff --git a/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts b/packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts
@@ -103,7 +103,9 @@ export class ModelsHandler {
           fileModelItem.resource.path === '/sandbox' + module.path
       );
 
-    fileModel.revert();
+    if (fileModel) {
+      fileModel.revert();
+    }
   }
 
   public changeModule = async (module: Module) => {
diff --git a/packages/app/src/app/overmind/namespaces/live/internalActions.ts b/packages/app/src/app/overmind/namespaces/live/internalActions.ts
@@ -59,9 +59,12 @@ export const initialize: AsyncAction<string, Sandbox | null> = async (
   state.live.isLoading = true;
 
   try {
-    const { roomInfo, liveUserId, sandbox } = await effects.live.joinChannel(
-      id
-    );
+    const {
+      roomInfo,
+      liveUserId,
+      sandbox,
+      moduleState,
+    } = await effects.live.joinChannel(id);
 
     state.live.roomInfo = roomInfo;
     state.live.liveUserId = liveUserId;
@@ -74,6 +77,8 @@ export const initialize: AsyncAction<string, Sandbox | null> = async (
       state.editor.currentId = sandbox.id;
     }
 
+    actions.live.internal.initializeModuleState(moduleState);
+
     effects.analytics.track('Live Session Joined', {});
     effects.live.listen(actions.live.liveMessageReceived);
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,9 @@ export class ModelsHandler {`
`103`	`103`	`fileModelItem.resource.path === '/sandbox' + module.path`
`104`	`104`	`);`
`105`	`105`
`106`		`- fileModel.revert();`
	`106`	`+ if (fileModel) {`
	`107`	`+ fileModel.revert();`
	`108`	`+ }`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`public changeModule = async (module: Module) => {`