diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc index 1c3b4e215f61b94db6d2a31c2c6ab682c73a723f..e4f448049c8bdc7dadbfa74ec31cc54cbde2cfb6 100644 --- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc +++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc @@ -464,6 +464,10 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter itsBusyControllers = itsChildControl->countChilds(0, CNTLRTYPE_NO_TYPE); } else if (timerEvent.id == itsStopTimer) { + if (itsState == CTState::QUIT) { + LOG_INFO("Re-entry of quit-phase, ignored."); + break; + } setState(CTState::QUIT); itsChildResult = itsQuitReason; itsChildsInError = 0;