aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--dm/DMJsonWriter.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/dm/DMJsonWriter.cpp b/dm/DMJsonWriter.cpp
index 4fe6924327..04ae2cea8a 100644
--- a/dm/DMJsonWriter.cpp
+++ b/dm/DMJsonWriter.cpp
@@ -110,12 +110,15 @@ bool JsonWriter::ReadJson(const char* path, void(*callback)(BitmapResult)) {
BitmapResult br;
for (unsigned i = 0; i < results.size(); i++) {
const Json::Value& r = results[i];
- br.name = r["key"]["name"].asCString();
- br.config = r["key"]["config"].asCString();
- br.sourceType = r["key"]["source_type"].asCString();
- br.sourceOptions = r["key"]["source_options"].asCString();
- br.ext = r["options"]["ext"].asCString();
- br.md5 = r["md5"].asCString();
+ br.name = r["key"]["name"].asCString();
+ br.config = r["key"]["config"].asCString();
+ br.sourceType = r["key"]["source_type"].asCString();
+ br.ext = r["options"]["ext"].asCString();
+ br.md5 = r["md5"].asCString();
+
+ if (!r["key"]["source_options"].isNull()) {
+ br.sourceOptions = r["key"]["source_options"].asCString();
+ }
callback(br);
}
return true;