diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-07-08 10:18:24 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-07-08 10:18:24 +0200 |
| commit | a8c5d1f84cf08c922bbc64ba83af59535bc8c2af (patch) | |
| tree | c19e1ba51f0d89da8ea26b415a356b885e7400d4 /src/plugins/cpptools/cppcodeformatter.cpp | |
| parent | 7ae3fd5a10c584de0f0f0d1ff7761266eadc68d0 (diff) | |
| download | qt-creator-a8c5d1f84cf08c922bbc64ba83af59535bc8c2af.tar.gz | |
C++ indenter: Be more careful when comparing states.
Task-number: QTCREATORBUG-1818
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppcodeformatter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp index 5d42edef6d..f0288538a1 100644 --- a/src/plugins/cpptools/cppcodeformatter.cpp +++ b/src/plugins/cpptools/cppcodeformatter.cpp @@ -427,7 +427,8 @@ void CodeFormatter::updateStateUntil(const QTextBlock &endBlock) break; if (blockData.m_blockRevision != it.revision()) break; - if (previousState != blockData.m_beginState) + if (previousState.isEmpty() || blockData.m_beginState.isEmpty() + || previousState != blockData.m_beginState) break; if (loadLexerState(it) == -1) break; |