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

DiffEditor: fix the cancellation of diff requests

Browse Source 
Change-Id: I36c4af4ec51473fb9da5d9f099f2251f75b2020a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2017-07-05 16:22:10 +02:00
parent 8309e0c56a
commit 0b1eaacabb
2 changed files with 119 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -156,10 +156,12 @@ void DiffFilesController::reload()
void DiffFilesController::reloaded()
{
const QList<FileData> fileDataList = m_futureWatcher.future().results();
const bool success = !m_futureWatcher.future().isCanceled();
const QList<FileData> fileDataList = success
? m_futureWatcher.future().results() : QList<FileData>();
setDiffFiles(fileDataList);
reloadFinished(true);
reloadFinished(success);
}
void DiffFilesController::cancelReload()