2
0
Эх сурвалжийг харах

Merge pull request #1090 from Murii/patch-2

Fix for bug 1088
Juan Linietsky 10 жил өмнө
parent
commit
1714828b54
1 өөрчлөгдсөн 2 нэмэгдсэн , 0 устгасан
  1. 2 0
      core/dictionary.cpp

+ 2 - 0
core/dictionary.cpp

@@ -186,10 +186,12 @@ Error Dictionary::parse_json(const String& p_json) {
 
 	String errstr;
 	int errline=0;
+	if (p_json != ""){
 	Error err = JSON::parse(p_json,*this,errstr,errline);
 	if (err!=OK) {
 		ERR_EXPLAIN("Error parsing JSON: "+errstr+" at line: "+itos(errline));
 		ERR_FAIL_COND_V(err!=OK,err);
+		}
 	}
 
 	return OK;