diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-07-05 16:22:10 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2017-07-17 09:32:28 +0000 |
| commit | 0b1eaacabba0c0b9366766b020597d9280ff19af (patch) | |
| tree | 1731c51632fb313b30722731f67f83cec188c324 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 8309e0c56a234f7ab1c2d658fcd680b801a5e2f4 (diff) | |
| download | qt-creator-0b1eaacabba0c0b9366766b020597d9280ff19af.tar.gz | |
DiffEditor: fix the cancellation of diff requests
Change-Id: I36c4af4ec51473fb9da5d9f099f2251f75b2020a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 232c2addaa..6391c0ae0a 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -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() |