From 0b1eaacabba0c0b9366766b020597d9280ff19af Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 5 Jul 2017 16:22:10 +0200
Subject: DiffEditor: fix the cancellation of diff requests

Change-Id: I36c4af4ec51473fb9da5d9f099f2251f75b2020a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/diffeditor/diffeditorplugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/plugins/diffeditor')

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()
-- 
cgit v1.2.1