Fixed merge ignoring assigned scene tags.

2026-07-08 03:25:31 +02:00
parent 6779caccef
commit 93c31888b2
3 changed files with 9 additions and 3 deletions
--- a/pages/scene/+Page.vue
+++ b/pages/scene/+Page.vue
@@ -604,7 +604,9 @@ const tags = Array.from(scene.tags
 		if (accTag && tag.actorId) {
 			return acc.set(tag.id, {
 				...tag,
-				actors: [...accTag.actors, actorsById[tag.actorId]].toSorted((actorA, actorB) => actorA.name.localeCompare(actorB.name)),
+				actors: [...accTag.actors, actorsById[tag.actorId]]
+					.filter(Boolean) // shouldn't happen, but in case the tag actor isn't a scene actor
+					.toSorted((actorA, actorB) => actorA.name.localeCompare(actorB.name)),
 			});
 		}

@@ -616,7 +618,7 @@ const tags = Array.from(scene.tags
 		if (tag.actorId) {
 			return acc.set(tag.id, {
 				...tag,
-				actors: [actorsById[tag.actorId]],
+				actors: [actorsById[tag.actorId]].filter(Boolean),
 			});
 		}