aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditorplugin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
-rw-r--r--src/plugins/diffeditor/diffeditorplugin.cpp6
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()