From 8703bcd777f8d1c7e903162f03254f81630ca428 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 15 Aug 2022 12:19:30 +0200 Subject: [PATCH] VcsCommand: Don't cancel finished task from d'tor Amends a5683616b938deffa290f95aaa7f747c239360d7 Change-Id: I6b746dfa444737e87c98b878c017374f2034d400 Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcscommand.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp index ecb1192c097..d20b9ad69db 100644 --- a/src/plugins/vcsbase/vcscommand.cpp +++ b/src/plugins/vcsbase/vcscommand.cpp @@ -161,7 +161,8 @@ void VcsCommand::postRunCommand(const FilePath &workingDirectory) VcsCommand::~VcsCommand() { - d->m_watcher.cancel(); + if (!d->m_watcher.future().isFinished()) + d->m_watcher.future().cancel(); delete d; }