diff options
| author | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-03-20 10:24:59 +0100 |
|---|---|---|
| committer | Ivan Donchevskii <ivan.donchevskii@qt.io> | 2018-03-20 10:38:26 +0000 |
| commit | 5068f9ac367bafd8683b653366b42bcac5a3baf1 (patch) | |
| tree | fe27a88c7f23eb0a30a5603e97c2b362693e3d26 /src | |
| parent | cabbeb1c5450b67ba649d77474b892d5acb0d622 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/clangcodemodel/clangrefactoringengine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/clangcodemodel/clangrefactoringengine.cpp b/src/plugins/clangcodemodel/clangrefactoringengine.cpp index ff082e0a7a..d639e27667 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(); |