From a8c5d1f84cf08c922bbc64ba83af59535bc8c2af Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 8 Jul 2010 10:18:24 +0200
Subject: [PATCH] C++ indenter: Be more careful when comparing states.
Task-number: QTCREATORBUG-1818
---
src/plugins/cpptools/cppcodeformatter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 5d42edef6d0..f0288538a1f 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;
--
GitLab