From 9bb79d088a9150b4429c205654e925a88df49634 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 15 Oct 2024 06:46:12 +0200 Subject: [PATCH] TaskTree: Simplify withCancel() implementation Don't use nested group, use conjunction instead. Change-Id: Ifd4a6d89d17b3fc6d90f8dff60e2f997759ed5a5 Reviewed-by: hjk --- src/libs/solutions/tasking/tasktree.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libs/solutions/tasking/tasktree.cpp b/src/libs/solutions/tasking/tasktree.cpp index d8ff38eab8e..206b7e2310b 100644 --- a/src/libs/solutions/tasking/tasktree.cpp +++ b/src/libs/solutions/tasking/tasktree.cpp @@ -1730,10 +1730,7 @@ Group ExecutableItem::withCancelImpl( return Group { parallel, stopOnSuccessOrError, - Group { - finishAllAndError, - BarrierTask(onSetup) - }, + BarrierTask(onSetup) && errorItem, *this }; }