diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-18 15:23:29 +0200 |
| commit | 361fdad3be3421496be4dab014a8bee369687387 (patch) | |
| tree | 4412737d90b20953064b8f53817c014ddc9714c3 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 5e38bdbfd8bef6c3bdcede9fe0be11f34e9a0f7c (diff) | |
| parent | 41ae823bda7cc1bad4b85861d9b0e3087c130e4a (diff) | |
Merge remote-tracking branch 'origin/4.4'
Change-Id: I778acc044ac105a11054b314aecac5b1c2cfee6a
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() |