merging

1 files changed, 7 insertions, 4 deletions

diff --git a/src/client/util/UndoManager.ts b/src/client/util/UndoManager.ts
index 569ad8ab4..05fb9f378 100644
--- a/src/client/util/UndoManager.ts
+++ b/src/client/util/UndoManager.ts
@@ -148,12 +148,15 @@ export namespace UndoManager {
         }
     });
 
-    export function ClearTempBatch() {
-        tempEvents = undefined;
-    }
     export function RunInTempBatch<T>(fn: () => T) {
         tempEvents = [];
-        return runInAction(fn);
+        try {
+            const success = runInAction(fn);
+            if (!success) UndoManager.UndoTempBatch();
+            return success;
+        } finally {
+            tempEvents = undefined;
+        }
     }
     //TODO Make this return the return value
     export function RunInBatch<T>(fn: () => T, batchName: string) {