Skip to content

Commit c1a9a02

Browse files
committed
Merge branch 'release51' into release52
# Conflicts: # meteor/package.json # meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts # meteor/server/api/deviceTriggers/observer.ts # meteor/yarn.lock # package.json # packages/blueprints-integration/package.json # packages/corelib/package.json # packages/documentation/docs/user-guide/features/access-levels.md # packages/documentation/package.json # packages/job-worker/package.json # packages/lerna.json # packages/live-status-gateway/package.json # packages/mos-gateway/package.json # packages/openapi/package.json # packages/package.json # packages/playout-gateway/package.json # packages/server-core-integration/package.json # packages/shared-lib/package.json # packages/yarn.lock
2 parents d421e78 + 847bf1c commit c1a9a02

File tree

16 files changed

+321
-166
lines changed

16 files changed

+321
-166
lines changed

.github/workflows/node.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,6 @@ jobs:
758758
CI: true
759759
- name: Run check
760760
run: |
761-
node scripts/checkForMultipleVersions.mjs
761+
yarn validate:versions
762762
env:
763763
CI: true

meteor/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
### [1.51.4](///compare/v1.51.3...v1.51.4) (2024-12-04)
6+
7+
8+
### Bug Fixes
9+
10+
* Device Action Studio Context gets lost, Adlib previews are unstable 193815d
11+
* Live Status Gateway Dockerfile (regular) still uses yarn to start 0ae53c4
12+
* release scripts broken on Windows 9636051
13+
* RundownView shows spinner when unMOSing a Rundown from a Playlist 874e85c
14+
515
### [1.51.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.51.1...v1.51.2) (2024-11-21)
616

717

meteor/server/api/deviceTriggers/RundownContentObserver.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,18 @@ export class RundownContentObserver {
3333
#observers: Meteor.LiveQueryHandle[] = []
3434
#cache: ContentCache
3535
#cancelCache: () => void
36-
#cleanup: () => void = () => {
36+
#cleanup: (() => void) | undefined = () => {
3737
throw new Error('RundownContentObserver.#cleanup has not been set!')
3838
}
3939
#disposed = false
4040

4141
private constructor(onChanged: ChangedHandler) {
4242
const { cache, cancel: cancelCache } = createReactiveContentCache(() => {
43+
if (this.#disposed) {
44+
this.#cleanup?.()
45+
return
46+
}
4347
this.#cleanup = onChanged(cache)
44-
if (this.#disposed) this.#cleanup()
4548
}, REACTIVITY_DEBOUNCE)
4649

4750
this.#cache = cache
@@ -173,5 +176,6 @@ export class RundownContentObserver {
173176
this.#cancelCache()
174177
this.#observers.forEach((observer) => observer.stop())
175178
this.#cleanup?.()
179+
this.#cleanup = undefined
176180
}
177181
}

0 commit comments

Comments
 (0)