From f24fafe90cdc1b791ec4be0e999675b1af4a7ab5 Mon Sep 17 00:00:00 2001 From: Jake Smith Date: Thu, 20 Jun 2024 12:20:21 +0100 Subject: [PATCH] rollback abort !started changes Signed-off-by: Jake Smith --- thorlcr/graph/thgraph.cpp | 2 +- thorlcr/graph/thgraphslave.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thorlcr/graph/thgraph.cpp b/thorlcr/graph/thgraph.cpp index 6baa8b52c51..6a301336a01 100644 --- a/thorlcr/graph/thgraph.cpp +++ b/thorlcr/graph/thgraph.cpp @@ -1812,7 +1812,7 @@ bool CGraphBase::wait(unsigned timeout) void CGraphBase::abort(IException *e) { - if (aborted || !started) + if (aborted) return; GraphPrintLog("Aborted"); diff --git a/thorlcr/graph/thgraphslave.cpp b/thorlcr/graph/thgraphslave.cpp index 19ca9afa76f..2ffb55e596d 100644 --- a/thorlcr/graph/thgraphslave.cpp +++ b/thorlcr/graph/thgraphslave.cpp @@ -1222,7 +1222,7 @@ void CSlaveGraph::executeSubGraph(size32_t parentExtractSz, const byte *parentEx void CSlaveGraph::abort(IException *e) { - if (aborted || !started) + if (aborted) return; if (!graphDone) // set pre done(), no need to abort if got that far. CGraphBase::abort(e);