wip: disposed

bbc · Jan 28, 2025 · 3566712 · 3566712
1 parent e95cfec
commit 3566712
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts b/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts
@@ -163,6 +163,8 @@ export class BucketContentObserver implements Meteor.LiveQueryHandle {
 
 	private updateBlueprintIds = _.debounce(
 		Meteor.bindEnvironment(() => {
+			if (this.#disposed) return
+
 			const newBlueprintIds = _.uniq(this.#cache.ShowStyleSourceLayers.find({}).map((rd) => rd.blueprintId))
 
 			if (!equivalentArrays(newBlueprintIds, this.#blueprintIds)) {

diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts b/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts
@@ -60,6 +60,8 @@ export class RundownContentObserver {
 		this.#cache = cache
 	}
 
+	#disposed = false
+
 	static async create(rundownIds: RundownId[], cache: ContentCache): Promise<RundownContentObserver> {
 		logger.silly(`Creating RundownContentObserver for rundowns "${rundownIds.join(',')}"`)
 
@@ -261,6 +263,8 @@ export class RundownContentObserver {
 
 	private updateShowStyleBaseIds = _.debounce(
 		Meteor.bindEnvironment(() => {
+			if (this.#disposed) return
+
 			const newShowStyleBaseIds = _.uniq(this.#cache.Rundowns.find({}).map((rd) => rd.showStyleBaseId))
 
 			if (!equivalentArrays(newShowStyleBaseIds, this.#showStyleBaseIds)) {
@@ -277,6 +281,8 @@ export class RundownContentObserver {
 
 	private updateBlueprintIds = _.debounce(
 		Meteor.bindEnvironment(() => {
+			if (this.#disposed) return
+
 			const newBlueprintIds = _.uniq(this.#cache.ShowStyleSourceLayers.find({}).map((rd) => rd.blueprintId))
 
 			if (!equivalentArrays(newBlueprintIds, this.#blueprintIds)) {
@@ -294,6 +300,8 @@ export class RundownContentObserver {
 	}
 
 	public dispose = (): void => {
+		this.#disposed = true
+
 		this.#observers.forEach((observer) => observer.stop())
 	}
 }