From 4d7a26a66d3a8bb278e2c3fc06edc7fc42ce839d Mon Sep 17 00:00:00 2001 From: cv <34649812+cpvalente@users.noreply.github.com> Date: Mon, 14 Jun 2021 14:50:04 +0200 Subject: [PATCH] fix: delete all eventlist in timer object was not reset correctly --- server/src/classes/EventTimer.js | 9 +++++++++ server/src/controllers/eventsController.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/src/classes/EventTimer.js b/server/src/classes/EventTimer.js index 28af03c87..2d2bb16ff 100644 --- a/server/src/classes/EventTimer.js +++ b/server/src/classes/EventTimer.js @@ -480,6 +480,15 @@ export class EventTimer extends Timer { }); } + clearEventList() { + // unload events + this.unload(); + + // set general + this._eventlist = []; + this.numEvents = 0; + } + setupWithEventList(eventlist) { if (!Array.isArray(eventlist) || eventlist.length < 1) return; diff --git a/server/src/controllers/eventsController.js b/server/src/controllers/eventsController.js index 92fe2bf71..2b1a35099 100644 --- a/server/src/controllers/eventsController.js +++ b/server/src/controllers/eventsController.js @@ -320,7 +320,7 @@ export const eventsDeleteAll = async (req, res) => { db.write(); // update timer object - _updateTimersSingle(); + global.timer.clearEventList(); res.sendStatus(201); } catch (error) {