diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-02 11:50:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-02 11:50:47 -0300 |
| commit | 1714828b54c7866184cfcfe3ac05669fce257565 (patch) | |
| tree | e9deab9989cf95876daf9e61e4c63723088913b3 | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
| parent | 9ee218ac9ba464687a41eea59707187aea28c962 (diff) | |
Merge pull request #1090 from Murii/patch-2
Fix for bug 1088
| -rw-r--r-- | core/dictionary.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 16ee397382..2d503bae50 100644 --- a/core/dictionary.cpp +++ b/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; |