Fix Engine::ScheduleRun() in case callback funtion done before system…

…Layer->ScheduleWork() returns. (project-chip#14596) - setup mRunScheduled = true before execute ScheduleWork()
lnikulin · Feb 2, 2022 · b8d9553 · b8d9553
1 parent 63a5c52
commit b8d9553
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp
@@ -480,9 +480,13 @@ CHIP_ERROR Engine::ScheduleRun()
     {
         return CHIP_ERROR_INCORRECT_STATE;
     }
-    ReturnErrorOnFailure(systemLayer->ScheduleWork(Run, this));
     mRunScheduled = true;
-    return CHIP_NO_ERROR;
+    auto err = systemLayer->ScheduleWork(Run, this);
+    if (!::chip::ChipError::IsSuccess(err))
+    {
+        mRunScheduled = false;
+    }
+    return err;
 }
 
 void Engine::Run()