mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 21:09:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid mistaking a nil/null value for an empty object or array in setpropertytopic

Browse Source
This commit is contained in:
Emma Broman
2021-04-21 11:24:09 +02:00
parent 2b74a04415
commit 385a2a2be1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/server/src/topics/setpropertytopic.cpp
View File

@@ -77,10 +77,11 @@ namespace {
else if (value.is_number()) {
return std::to_string(value.get<double>());
}
else if (value.empty()) {
return "{}";
}
else if (value.is_array()) {
if (value.empty()) {
return "{}";
}
std::string literal = "{";
for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
literal += luaLiteralFromJson(it.value()) += ",";
@@ -90,6 +91,10 @@ namespace {
return literal;
}
else if (value.is_object()) {
if (value.empty()) {
return "{}";
}
std::string literal = "{";
for (nlohmann::json::iterator it = value.begin(); it != value.end(); ++it) {
literal += it.key() + "=" + luaLiteralFromJson(it.value()) += ",";