From b156936d0f1b2407e3cbdeee47ce56d8708488a6 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Tue, 9 Jul 2013 09:24:38 +0000
Subject: [PATCH] Task #4642: Registering manual abort from Navigator as abort
in run-mode also.
---
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index 975e7ff7b52..608a439afb8 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -980,7 +980,7 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event)
string command = ((GCFPVString*) (dpEvent.value._pValue))->getValue();
if (command == "ABORT") {
LOG_INFO("Received manual request for abort, accepting it.");
- if (itsState < CTState::RESUME) {
+ if (itsState <= CTState::RESUME) {
itsQuitReason = CT_RESULT_MANUAL_ABORT;
}
itsTimerPort->cancelTimer(itsStopTimer); // cancel old timer
--
GitLab