godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug 1088

This commit is contained in:
Muresan Vlad aka Mury 2015-01-02 13:31:25 +02:00
parent 530d717a67
commit 9ee218ac9b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/dictionary.cpp
View File

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