From b9282b27e54d41a8cae81eec4d1cbe87801d61a4 Mon Sep 17 00:00:00 2001
From: bwees <brandonwees@gmail.com>
Date: Sun, 29 Mar 2026 20:26:21 -0500
Subject: [PATCH] fix: await both live photo and regular asset when applying
 edits

---
 web/src/lib/managers/edit/edit-manager.svelte.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/managers/edit/edit-manager.svelte.ts b/web/src/lib/managers/edit/edit-manager.svelte.ts
index f770425de4..1d4eb6a70f 100644
--- a/web/src/lib/managers/edit/edit-manager.svelte.ts
+++ b/web/src/lib/managers/edit/edit-manager.svelte.ts
@@ -127,8 +127,16 @@ export class EditManager {
 
     try {
       // Setup the websocket listener before sending the edit request
-      const editCompleted = waitForWebsocketEvent('AssetEditReadyV1', (event) => event.asset.id === assetId, 10_000);
+      const editEvents = [waitForWebsocketEvent('AssetEditReadyV1', (event) => event.asset.id === assetId, 10_000)];
+
       if (this.currentAsset.livePhotoVideoId) {
+        editEvents.push(
+          waitForWebsocketEvent(
+            'AssetEditReadyV1',
+            (event) => event.asset.id === this.currentAsset!.livePhotoVideoId,
+            10_000,
+          ),
+        );
       }
 
       await (edits.length === 0
@@ -140,7 +148,7 @@ export class EditManager {
             },
           }));
 
-      await editCompleted;
+      await Promise.all(editEvents);
 
       eventManager.emit('AssetEditsApplied', assetId);