Fixed crash in State Signal

alexanderoster · alexanderoster · commit 4e410e450570 · 2026-01-16T16:32:08.000+01:00
diff --git a/Implementation/Core/amc_statesignal.cpp b/Implementation/Core/amc_statesignal.cpp
@@ -86,6 +86,7 @@ namespace AMC {
 	{
 		if (m_pTelemetryInQueueMarker.get() != nullptr) {
 			m_pTelemetryInQueueMarker->finishMarker();
+			m_pTelemetryInQueueMarker = nullptr;
 		}
 		
 		if (m_pTelemetryInProcessMarker.get () != nullptr) {
@@ -139,9 +140,7 @@ namespace AMC {
 
 	bool CStateSignalMessage::hadReactionTimeout(uint64_t nGlobalTimestamp)
 	{
-		uint64_t nInQueueTimestamp = m_pTelemetryInQueueMarker->getStartTimestamp();
-
-		uint64_t nTimeoutTimestamp = nInQueueTimestamp + (uint64_t)m_nReactionTimeoutInMS * 1000;
+		uint64_t nTimeoutTimestamp = m_nCreationTimestamp + (uint64_t)m_nReactionTimeoutInMS * 1000;
 		return (nGlobalTimestamp >= nTimeoutTimestamp);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ namespace AMC {`
`86`	`86`	`{`
`87`	`87`	`if (m_pTelemetryInQueueMarker.get() != nullptr) {`
`88`	`88`	`m_pTelemetryInQueueMarker->finishMarker();`
	`89`	`+ m_pTelemetryInQueueMarker = nullptr;`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`if (m_pTelemetryInProcessMarker.get () != nullptr) {`
`@@ -139,9 +140,7 @@ namespace AMC {`
`139`	`140`
`140`	`141`	`bool CStateSignalMessage::hadReactionTimeout(uint64_t nGlobalTimestamp)`
`141`	`142`	`{`
`142`		`- uint64_t nInQueueTimestamp = m_pTelemetryInQueueMarker->getStartTimestamp();`
`143`		`-`
`144`		`- uint64_t nTimeoutTimestamp = nInQueueTimestamp + (uint64_t)m_nReactionTimeoutInMS * 1000;`
	`143`	`+ uint64_t nTimeoutTimestamp = m_nCreationTimestamp + (uint64_t)m_nReactionTimeoutInMS * 1000;`
`145`	`144`	`return (nGlobalTimestamp >= nTimeoutTimestamp);`
`146`	`145`	`}`
`147`	`146`