From b1a71f7b9680df8f9e27eb6564d08c94b60796c1 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 11 Mar 2015 13:24:20 +0100 Subject: DiffEditor: Fix line number forcing Change-Id: I876c8ca6bc442cec853c41c48eb2be83def4558c Reviewed-by: Tobias Hunger --- src/plugins/diffeditor/diffeditordocument.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/diffeditor/diffeditordocument.cpp') diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 0937a230e0..b091c3eece 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -160,6 +160,7 @@ QString DiffEditorDocument::description() const void DiffEditorDocument::setContextLineCount(int lines) { + QTC_ASSERT(!m_isContextLineCountForced, return); m_contextLineCount = lines; } @@ -181,8 +182,6 @@ bool DiffEditorDocument::isContextLineCountForced() const void DiffEditorDocument::setIgnoreWhitespace(bool ignore) { - if (m_isContextLineCountForced) - return; m_ignoreWhitespace = ignore; } -- cgit v1.2.1