Merge pull request #1334 from nrkno/fix/sofie-3638/device-action-context-lost

fix(Core/Publications/Device Triggers): Device Action Studio Context gets lost, Adlib previews are unstable (SOFIE-3638)

Author: jstarpl

meteor/server/api/deviceTriggers/RundownContentObserver.ts

@@ -32,7 +32,7 @@ export class RundownContentObserver {
 	#observers: Meteor.LiveQueryHandle[] = []
 	#cache: ContentCache
 	#cancelCache: () => void
-	#cleanup: () => void = () => {
+	#cleanup: (() => void) | undefined = () => {
 		throw new Error('RundownContentObserver.#cleanup has not been set!')
 	}
 	#disposed = false
@@ -45,8 +45,11 @@ export class RundownContentObserver {
 	) {
 		logger.silly(`Creating RundownContentObserver for playlist "${rundownPlaylistId}"`)
 		const { cache, cancel: cancelCache } = createReactiveContentCache(() => {
+			if (this.#disposed) {
+				this.#cleanup?.()
+				return
+			}
 			this.#cleanup = onChanged(cache)
-			if (this.#disposed) this.#cleanup()
 		}, REACTIVITY_DEBOUNCE)
 
 		this.#cache = cache
@@ -157,5 +160,6 @@ export class RundownContentObserver {
 		this.#cancelCache()
 		this.#observers.forEach((observer) => observer.stop())
 		this.#cleanup?.()
+		this.#cleanup = undefined
 	}
 }