From dc21169fbd224d0fd803dafc88ff1388ac6d65f5 Mon Sep 17 00:00:00 2001 From: anschrammh Date: Thu, 10 Oct 2019 18:20:51 +0200 Subject: [PATCH] Solved a bug with tasks that are meant to not trigger right away --- src/app/TaskSchedulerManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/TaskSchedulerManager.cpp b/src/app/TaskSchedulerManager.cpp index 9bc8e39..1ed7849 100644 --- a/src/app/TaskSchedulerManager.cpp +++ b/src/app/TaskSchedulerManager.cpp @@ -11,7 +11,7 @@ TaskSchedulerManagerHelper::Schedule::Schedule() : _triggerType(TRIGGER_REPEAT), _mode(EVERY), _enabled(true), - _millis(0), + _millis(millis()), _everyMillis(1000), _dateTime(NULL) { @@ -27,7 +27,7 @@ TaskSchedulerManagerHelper::Schedule::Schedule(const TaskSchedulerManagerHelper: _triggerType(Object._triggerType), _mode(Object._mode), _enabled(Object._enabled), - _millis(0), + _millis(Object._millis), _everyMillis(Object._everyMillis), _dateTime(NULL) { @@ -214,7 +214,7 @@ void TaskSchedulerManager::runTaskScheduler() if(p->schedule._triggerType != TaskSchedulerManagerHelper::Schedule::TRIGGER_ONCE_AND_DELETE)_nextTaskIndexToBeRun++; else if(p->schedule._triggerType == TaskSchedulerManagerHelper::Schedule::TRIGGER_ONCE_AND_DELETE && !(p->schedule._triggered))_nextTaskIndexToBeRun++; - else if(p->schedule._triggerType == TaskSchedulerManagerHelper::Schedule::TRIGGER_ONCE_AND_DELETE && p->schedule._triggered) //If the task has to be deleted after executing and if it has been executed, we delete it + else if(p->schedule._triggerType == TaskSchedulerManagerHelper::Schedule::TRIGGER_ONCE_AND_DELETE && p->schedule._triggered) //If the task has to be deleted after it has been executed and if it has, we delete it { _taskDataDictio.removeAt(_nextTaskIndexToBeRun); }