From 53f8956fb8a4fd606a140e804a9d67a20c55f380 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 23 Feb 2024 17:01:03 +0100
Subject: [PATCH] FunctionDeclDefLinkFinder: Ensure the old futures are
 synchronized

Change-Id: I68b271f85d2bb319230529d4b0b074c05c12ba4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/cppeditor/cppfunctiondecldeflink.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index 710397e3a81..e489045f351 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -14,8 +14,6 @@
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
-#include <texteditor/refactoroverlay.h>
-#include <texteditor/texteditorconstants.h>
 
 #include <cplusplus/ASTPath.h>
 #include <cplusplus/CppRewriter.h>
@@ -23,7 +21,13 @@
 #include <cplusplus/Overview.h>
 #include <cplusplus/TypeOfExpression.h>
 
+#include <extensionsystem/pluginmanager.h>
+
+#include <texteditor/refactoroverlay.h>
+#include <texteditor/texteditorconstants.h>
+
 #include <utils/async.h>
+#include <utils/futuresynchronizer.h>
 #include <utils/proxyaction.h>
 #include <utils/qtcassert.h>
 #include <utils/textutils.h>
@@ -235,6 +239,7 @@ void FunctionDeclDefLinkFinder::startFindLinkAt(
     m_watcher.reset(new QFutureWatcher<std::shared_ptr<FunctionDeclDefLink> >());
     connect(m_watcher.get(), &QFutureWatcherBase::finished, this, &FunctionDeclDefLinkFinder::onFutureDone);
     m_watcher->setFuture(Utils::asyncRun(findLinkHelper, result, refactoringChanges));
+    ExtensionSystem::PluginManager::futureSynchronizer()->addFuture(m_watcher->future());
 }
 
 bool FunctionDeclDefLink::isValid() const