github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-19 22:03:51 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Fix in Jsonize (thanks fermium)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15689 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2021-01-21 17:00:51 +00:00
parent 7a1c55ca9f
commit 5cb8ccbcc6
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/Core/JSON.h
View file

@ -334,8 +334,8 @@ void JsonizeMap(JsonIO& io, T& map, const char *keyid, const char *valueid)
K key;
V value;
LoadFromJsonValue(key, va[i][keyid]);
LoadFromJsonValue(value, va[i][valueid]);
map.Add(key, value);
LoadFromJsonValue(value, va[i][valueid]);
map.Add(key, pick(value));
}
}
else {
@ -362,8 +362,8 @@ void JsonizeSortedMap(JsonIO& io, T& map, const char *keyid, const char *valueid
K key;
V value;
LoadFromJsonValue(key, va[i][keyid]);
LoadFromJsonValue(value, va[i][valueid]);
map.Add(key, value);
LoadFromJsonValue(value, va[i][valueid]);
map.Add(key, pick(value));
}
}
else {
@ -390,8 +390,8 @@ void JsonizeStringMap(JsonIO& io, T& map)
V value;
String key = va.GetKey(i);
LoadFromJsonValue(key, va.GetKey(i));
LoadFromJsonValue(value, va.GetValue(i));
map.Add(key, value);
LoadFromJsonValue(value, va.GetValue(i));
map.Add(key, pick(value));
}
}
else {
@ -430,7 +430,7 @@ void JsonizeIndex(JsonIO& io, T& index)
for(int i = 0; i < va.GetCount(); i++) {
V v;
LoadFromJsonValue(v, va[i]);
index.Add(v);
index.Add(pick(v));
}
}
else {