feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Check that local renaming QFuture is not cancelled

Browse Source 
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>
This commit is contained in:
Ivan Donchevskii
2018-03-20 10:24:59 +01:00
parent cabbeb1c54
commit 5068f9ac36
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangcodemodel/clangrefactoringengine.cpp
View File

@@ -52,6 +52,8 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
return defaultCallback(); return defaultCallback();
QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() { QObject::connect(&m_watcher, &FutureCursorWatcher::finished, [=]() {
if (m_watcher.isCanceled())
return defaultCallback();
const CppTools::CursorInfo info = m_watcher.result(); const CppTools::CursorInfo info = m_watcher.result();
if (info.useRanges.empty()) if (info.useRanges.empty())
return defaultCallback(); return defaultCallback();