feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DiffEditor: Fix line number forcing

Browse Source 
Change-Id: I876c8ca6bc442cec853c41c48eb2be83def4558c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-03-11 13:24:20 +01:00
parent cce834aebc
commit b1a71f7b96
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/diffeditor/diffeditordocument.cpp
View File

@@ -160,6 +160,7 @@ QString DiffEditorDocument::description() const
void DiffEditorDocument::setContextLineCount(int lines) void DiffEditorDocument::setContextLineCount(int lines)
{ {
QTC_ASSERT(!m_isContextLineCountForced, return);
m_contextLineCount = lines; m_contextLineCount = lines;
} }
@@ -181,8 +182,6 @@ bool DiffEditorDocument::isContextLineCountForced() const
void DiffEditorDocument::setIgnoreWhitespace(bool ignore) void DiffEditorDocument::setIgnoreWhitespace(bool ignore)
{ {
if (m_isContextLineCountForced)
return;
m_ignoreWhitespace = ignore; m_ignoreWhitespace = ignore;
} }