summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2018-05-04 09:40:18 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2018-05-04 07:58:37 +0000
commit1a2376856343b6ea535af37050deb1b6ff7b052f (patch)
treefd42b01e57e66a889ae1ce8ae747a23ea78e148c /src/plugins/diffeditor
parent416e4dc1adbefe585e70389179b560bdcba0aa14 (diff)
downloadqt-creator-1a2376856343b6ea535af37050deb1b6ff7b052f.tar.gz
Ignore index change when we set the document
Do the same as in case of sidebyside editor. Task-number: QTCREATORBUG-18306 Change-Id: I1364aed0edb02dd9f5432e191ce4fb4b2db34430 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor')
-rw-r--r--src/plugins/diffeditor/unifieddiffeditorwidget.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
index 54ca275a58..83767e0a72 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
@@ -284,9 +284,12 @@ void UnifiedDiffEditorWidget::setDiff(const QList<FileData> &diffFileList,
{
Q_UNUSED(workingDirectory)
+ const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange;
+ m_controller.m_ignoreCurrentIndexChange = true;
clear();
m_controller.m_contextFileData = diffFileList;
showDiff();
+ m_controller.m_ignoreCurrentIndexChange = oldIgnore;
}
QString UnifiedDiffEditorWidget::showChunk(const ChunkData &chunkData,