1 files changed, 11 insertions, 28 deletions

diff --git a/packages/main/src/infrastructure/electron/RendererBridge.ts b/packages/main/src/infrastructure/electron/RendererBridge.ts
index 8633b9d..921f09a 100644
--- a/packages/main/src/infrastructure/electron/RendererBridge.ts
+++ b/packages/main/src/infrastructure/electron/RendererBridge.ts
@@ -22,16 +22,12 @@ import type { SharedStoreSnapshotOut } from '@sophie/shared';
 import {
   addMiddleware,
   getSnapshot,
-  IJsonPatch,
-  IMiddlewareEvent,
+  type IJsonPatch,
   onPatch,
 } from 'mobx-state-tree';
 
-import type MainStore from '../../stores/MainStore';
-import Disposer from '../../utils/Disposer';
-import { getLogger } from '../../utils/log';
-
-const log = getLogger('RendererBridge');
+import type MainStore from '../../stores/MainStore.js';
+import Disposer from '../../utils/Disposer.js';
 
 export type PatchListener = (patch: IJsonPatch[]) => void;
 
@@ -45,41 +41,28 @@ export default class RendererBridge {
   constructor(store: MainStore, listener: PatchListener) {
     this.snapshot = getSnapshot(store.shared);
 
-    // The call for the currently pending action, if any.
-    let topLevelCall: IMiddlewareEvent | undefined;
     // An array of accumulated patches if we're in an action, `undefined` otherwise.
     let patches: IJsonPatch[] | undefined;
 
     this.disposeOnPatch = onPatch(store.shared, (patch) => {
       if (patches === undefined) {
         // Update unprotected stores (outside an action) right away.
-        listener([patch]);
+        try {
+          listener([patch]);
+        } finally {
+          this.snapshot = getSnapshot(store.shared);
+        }
       } else {
         patches.push(patch);
       }
     });
 
-    this.disposeMiddleware = addMiddleware(store, (call, next, abort) => {
-      if (call.parentActionEvent !== undefined) {
+    this.disposeMiddleware = addMiddleware(store, (call, next) => {
+      if (patches !== undefined) {
         // We're already in an action, there's no need to enter one.
         next(call);
         return;
       }
-      if (patches !== undefined) {
-        log.error(
-          'Unexpected call',
-          call,
-          'during dispatching another call',
-          topLevelCall,
-          'with accumulated patches',
-          patches,
-        );
-        abort(undefined);
-        return;
-      }
-      // Make shure that the saved snapshot is consistent with the patches we're going to send.
-      this.snapshot = getSnapshot(store.shared);
-      topLevelCall = call;
       patches = [];
       try {
         next(call);
@@ -89,8 +72,8 @@ export default class RendererBridge {
             listener(patches);
           }
         } finally {
-          topLevelCall = undefined;
           patches = undefined;
+          this.snapshot = getSnapshot(store.shared);
         }
       }
     });