From 5068f9ac367bafd8683b653366b42bcac5a3baf1 Mon Sep 17 00:00:00 2001
From: Ivan Donchevskii <ivan.donchevskii@qt.io>
Date: Tue, 20 Mar 2018 10:24:59 +0100
Subject: [PATCH] Clang: Check that local renaming QFuture is not cancelled

We can't take QFuture result if it's cancelled.

Task-number: QTCREATORBUG-20008
Change-Id: I781746cf1d638627bb5992efa23d94111908f6d0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 src/plugins/clangcodemodel/clangrefactoringengine.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/clangcodemodel/clangrefactoringengine.cpp b/src/plugins/clangcodemodel/clangrefactoringengine.cpp
index ff082e0a7a3..d639e276673 100644
--- a/src/plugins/clangcodemodel/clangrefactoringengine.cpp
+++ b/src/plugins/clangcodemodel/clangrefactoringengine.cpp
@@ -52,6 +52,8 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
         return defaultCallback();
 
     QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() {
+        if (m_watcher.isCanceled())
+            return defaultCallback();
         const CppTools::CursorInfo info = m_watcher.result();
         if (info.useRanges.empty())
             return defaultCallback();