summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcodeformatter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpptools/cppcodeformatter.cpp')
-rw-r--r--src/plugins/cpptools/cppcodeformatter.cpp3
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;