From e637e48397143a3b1fb1321a33f6480640ef1885 Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Tue, 28 Jan 2014 15:55:08 +0000
Subject: [PATCH] Task #5387: Update after testing.
---
.../MainCU/src/ObservationControl/ObservationControl.cc | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index a86bd0033eb..a97a0e60791 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -980,17 +980,13 @@ 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) {
- itsQuitReason = CT_RESULT_MANUAL_ABORT;
- }
+ itsQuitReason = CT_RESULT_MANUAL_ABORT;
itsTimerPort->cancelTimer(itsStopTimer); // cancel old timer
itsStopTimer = itsTimerPort->setTimer(0.0); // expire immediately
}
else if (command == "FINISH") {
LOG_INFO("Received manual request for finish, accepting it.");
- if (itsState <= CTState::RESUME) {
- itsQuitReason = CT_RESULT_NO_ERROR;
- }
+ itsQuitReason = CT_RESULT_NO_ERROR;
itsTimerPort->cancelTimer(itsStopTimer); // cancel old timer
itsStopTimer = itsTimerPort->setTimer(0.0); // expire immediately
}
--
GitLab