cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-17 13:23:35 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: stop log incorrectly (#1185)

Browse Source 
* fix: stop log incorrectly

* prevent start if already playing
This commit is contained in:
Alex Christoffer Rasmussen
2024-08-27 13:09:39 +02:00
committed by GitHub
parent db5fbd8019
commit e20cd87673
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/services/runtime-service/RuntimeService.ts
+4 -4
View File
@@ -512,8 +512,8 @@ class RuntimeService {
return; return;
} }
this.eventTimer?.pause(); this.eventTimer?.pause();
const newState = state.timer.playback; const newState = runtimeState.getState();
logger.info(LogOrigin.Playback, `Play Mode ${newState.toUpperCase()}`); logger.info(LogOrigin.Playback, `Play Mode ${newState.timer.playback.toUpperCase()}`);
process.nextTick(() => { process.nextTick(() => {
integrationService.dispatch(TimerLifeCycle.onPause); integrationService.dispatch(TimerLifeCycle.onPause);
}); });
@@ -531,8 +531,8 @@ class RuntimeService {
} }
const didStop = this.eventTimer?.stop(); const didStop = this.eventTimer?.stop();
if (didStop) { if (didStop) {
const newState = state.timer.playback; const newState = runtimeState.getState();
logger.info(LogOrigin.Playback, `Play Mode ${newState.toUpperCase()}`); logger.info(LogOrigin.Playback, `Play Mode ${newState.timer.playback.toUpperCase()}`);
process.nextTick(() => { process.nextTick(() => {
integrationService.dispatch(TimerLifeCycle.onStop); integrationService.dispatch(TimerLifeCycle.onStop);
}); });
packages/utils/src/validate-action/validatePlayback.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import { Playback, TimerPhase } from 'ontime-types';
*/ */
export function validatePlayback(currentPlayback: Playback, timerPhase: TimerPhase) { export function validatePlayback(currentPlayback: Playback, timerPhase: TimerPhase) {
return { return {
start: currentPlayback !== Playback.Stop, start: currentPlayback !== Playback.Stop && currentPlayback !== Playback.Play,
pause: currentPlayback === Playback.Play, pause: currentPlayback === Playback.Play,
roll: currentPlayback !== Playback.Roll && timerPhase !== TimerPhase.Overtime, roll: currentPlayback !== Playback.Roll && timerPhase !== TimerPhase.Overtime,
stop: currentPlayback !== Playback.Stop, stop: currentPlayback !== Playback.Stop,