From c617d97c29b8eb783db8f5c4914cb710fe629359 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 6 Nov 2023 11:50:36 +0100 Subject: [PATCH] TaskTree: Preserve the right order of the 0 TimeoutTask Like it's done for all other TimeoutTasks. Before it was flaky on mac. Change-Id: I2999b1264d313dda5d614d9dbd7ae03b2bf00fb0 Reviewed-by: Marcus Tillmanns --- 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 5dc743f1324..f3fc0ccd9bc 100644 --- a/src/libs/solutions/tasking/tasktree.cpp +++ b/src/libs/solutions/tasking/tasktree.cpp @@ -2728,10 +2728,7 @@ TimeoutTaskAdapter::~TimeoutTaskAdapter() void TimeoutTaskAdapter::start() { - if (*task() == milliseconds::zero()) - QTimer::singleShot(0, this, [this] { emit done(true); }); - else - m_timerId = scheduleTimeout(*task(), this, [this] { m_timerId = {}; emit done(true); }); + m_timerId = scheduleTimeout(*task(), this, [this] { m_timerId = {}; emit done(true); }); } } // namespace Tasking