From f9c03af5381c34d8ddbcc8dd8bee9ec1fb6991ec Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 10 Mar 2023 20:13:36 +0100
Subject: [PATCH] logic errors

---
 mission/tmtc/TmStoreTaskBase.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mission/tmtc/TmStoreTaskBase.cpp b/mission/tmtc/TmStoreTaskBase.cpp
index 1bd34ce0..fc79439b 100644
--- a/mission/tmtc/TmStoreTaskBase.cpp
+++ b/mission/tmtc/TmStoreTaskBase.cpp
@@ -9,13 +9,13 @@ TmStoreTaskBase::TmStoreTaskBase(object_id_t objectId, StorageManagerIF& ipcStor
 
 bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event eventIfDone) {
   ReturnValue_t result;
-  bool tmToStoreReceived = true;
-  bool tcRequestReceived = true;
+  bool tmToStoreReceived = false;
+  bool tcRequestReceived = false;
   bool dumpsPerformed = false;
   // Store TM persistently
   result = store.handleNextTm();
-  if (result == MessageQueueIF::EMPTY) {
-    tmToStoreReceived = false;
+  if (result == returnvalue::OK) {
+    tmToStoreReceived = true;
   }
   // Dump TMs when applicable
   if (store.getState() == PersistentTmStore::State::DUMPING) {
@@ -37,8 +37,8 @@ bool TmStoreTaskBase::handleOneStore(PersistentTmStoreWithTmQueue& store, Event
   } else {
     // Handle TC requests, for example deletion or retrieval requests.
     result = store.handleCommandQueue(ipcStore);
-    if (result == MessageQueueIF::EMPTY) {
-      tcRequestReceived = false;
+    if (result == returnvalue::OK) {
+      tcRequestReceived = true;
     }
   }
   if (tcRequestReceived or tmToStoreReceived or dumpsPerformed) {