Merge pull request #2414 from crr0004/2409-editor-freeze

Issue #2409 Fixes editor freeze
godotengine · Sep 2, 2015 · 7900d5d · 7900d5d
2 parents 688047a + f34c3e2
commit 7900d5d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/modules/gdscript/gd_parser.cpp b/modules/gdscript/gd_parser.cpp
@@ -1422,11 +1422,15 @@ bool GDParser::_recover_from_completion() {
 		return false; //can't recover if no completion
 	}
 	//skip stuff until newline
-	while(tokenizer->get_token()!=GDTokenizer::TK_NEWLINE && tokenizer->get_token()!=GDTokenizer::TK_EOF) {
+	while(tokenizer->get_token()!=GDTokenizer::TK_NEWLINE && tokenizer->get_token()!=GDTokenizer::TK_EOF && tokenizer->get_token()!=GDTokenizer::TK_ERROR) {
 		tokenizer->advance();
 	}
 	completion_found=false;
 	error_set=false;
+	if(tokenizer->get_token() == GDTokenizer::TK_ERROR){
+		error_set = true;
+	}
+
 	return true;
 }