Skip to content
Snippets Groups Projects
Commit b156936d authored by Ruud Overeem's avatar Ruud Overeem
Browse files

Task #4642: Registering manual abort from Navigator as abort in run-mode also.

parent df4709e6
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+ 1
− 1
View file @ b156936d
...@@ -980,7 +980,7 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event) ...@@ -980,7 +980,7 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event)
string command = ((GCFPVString*) (dpEvent.value._pValue))->getValue(); string command = ((GCFPVString*) (dpEvent.value._pValue))->getValue();
if (command == "ABORT") { if (command == "ABORT") {
LOG_INFO("Received manual request for abort, accepting it."); LOG_INFO("Received manual request for abort, accepting it.");
if (itsState < CTState::RESUME) { if (itsState <= CTState::RESUME) {
itsQuitReason = CT_RESULT_MANUAL_ABORT; itsQuitReason = CT_RESULT_MANUAL_ABORT;
} }
itsTimerPort->cancelTimer(itsStopTimer); // cancel old timer itsTimerPort->cancelTimer(itsStopTimer); // cancel old timer
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment