From 1305fad6b5757bb83392c91dc52a5f9b2e4d0255 Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Thu, 28 Oct 2021 15:27:23 +0200 Subject: [PATCH] fix: reset timers reset timers correctly when current event is deleted --- server/src/classes/EventTimer.js | 4 ++-- server/src/classes/Timer.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/classes/EventTimer.js b/server/src/classes/EventTimer.js index 30edaef49..413848959 100644 --- a/server/src/classes/EventTimer.js +++ b/server/src/classes/EventTimer.js @@ -1066,8 +1066,8 @@ export class EventTimer extends Timer { } unload() { - // reset duration - this.duration = null; + // reset timer + this._resetTimers(true); // reset selected this._resetSelection(); diff --git a/server/src/classes/Timer.js b/server/src/classes/Timer.js index 5bae78b0d..feacd458a 100644 --- a/server/src/classes/Timer.js +++ b/server/src/classes/Timer.js @@ -120,6 +120,7 @@ export class Timer { _resetTimers(total = false) { if (total) this.duration = null; this.current = this.duration; + this.running = null; this.secondaryTimer = null; this._finishAt = null; this._finishedAt = null;