fix: make first action undo-able

meetalva · Jun 12, 2018 · 6c645cd · 6c645cd
1 parent d6d5ec7
commit 6c645cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/electron/main.ts b/src/electron/main.ts
@@ -88,6 +88,12 @@ const userStore = new ElectronStore();
 			case ServerMessageType.AppLoaded: {
 				const pathToOpen = projectPath || openedFile;
 
+				send({
+					id: uuid.v4(),
+					type: ServerMessageType.StartApp,
+					payload: String(port)
+				});
+
 				// Load one of either
 				// (1) last known file automatically in development
 				// (2) file passed to electron main process
@@ -108,12 +114,6 @@ const userStore = new ElectronStore();
 					}
 				}
 
-				send({
-					id: uuid.v4(),
-					type: ServerMessageType.StartApp,
-					payload: String(port)
-				});
-
 				break;
 			}
 			case ServerMessageType.CreateNewFileRequest: {

diff --git a/src/electron/renderer.tsx b/src/electron/renderer.tsx
@@ -48,7 +48,6 @@ Sender.receive(message => {
 		case ServerMessageType.StartApp: {
 			app.setState(Types.AppState.Started);
 			store.setServerPort(Number(message.payload));
-			store.commit();
 			break;
 		}
 		case ServerMessageType.OpenFileResponse: {
@@ -71,13 +70,16 @@ Sender.receive(message => {
 					type: ServerMessageType.CheckLibraryRequest
 				});
 			}
+
+			store.commit();
 			break;
 		}
 		case ServerMessageType.CreateNewFileResponse: {
 			history.clear();
 			const newProject = Project.from(message.payload.contents);
 			store.setProject(newProject);
 			app.setActiveView(Types.AlvaView.PageDetail);
+			store.commit();
 			break;
 		}
 		case ServerMessageType.Log: {