Imported Upstream version 3.1.1+dfsg1upstream/3.1.1+dfsg1

1 files changed, 2 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
index e3e1950..ac8d6cf 100644
--- a/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/sqlitesyntaxhighlighter.cpp
@@ -12,7 +12,7 @@ SqliteSyntaxHighlighter::SqliteSyntaxHighlighter(QTextDocument *parent) :
     setupFormats();
     setupMapping();
     setCurrentBlockState(regulartTextBlockState);
-    connect(CFG, SIGNAL(massSaveCommited()), this, SLOT(setupFormats()));
+    connect(CFG, SIGNAL(massSaveCommitted()), this, SLOT(setupFormats()));
 }
 
 void SqliteSyntaxHighlighter::setSqliteVersion(int version)
@@ -125,7 +125,7 @@ QString SqliteSyntaxHighlighter::getPreviousStatePrefix(TextBlockState textBlock
 
 void SqliteSyntaxHighlighter::highlightBlock(const QString &text)
 {
-    if (text.length() <= 0)
+    if (text.length() <= 0 || document()->characterCount() > MAX_QUERY_LENGTH)
         return;
 
     // Reset to default
@@ -265,7 +265,6 @@ void SqliteSyntaxHighlighter::setCreateTriggerContext(bool value)
     createTriggerContext = value;
 }
 
-
 bool SqliteSyntaxHighlighter::getObjectLinksEnabled() const
 {
     return objectLinksEnabled;