SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

Compare commits

base: SHS:e22630b1bd72af3d77b161351cf96608b489c4f6
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old
...
compare: SHS:4253acb72b3d8003809976f42da581a56c683d69
Branches Tags
SHS:master SHS:pico_sdk SHS:winconsole_u16 SHS:pimap SHS:zmq SHS:concurrent SHS:old

1 Commits
e22630b1bd ... 4253acb72b

Author SHA1 Message Date
peri4
4253acb72b rename override to override_vt 2026-02-03 20:33:23 +03:00
1 changed files with 4 additions and 4 deletions
Expand all files Collapse all files

8
libs/main/serialization/pivaluetree_conversions.cpp
View File

@@ -348,8 +348,8 @@ PIValueTree PIValueTreeConversions::fromJSONFile(const PIString & path) {
auto ret = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(path))));
auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) {
auto override = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
ret.merge(override);
auto override_vt = PIValueTreeConversions::fromJSON(PIJSON::fromJSON(PIString::fromUTF8(PIFile::readAll(ofp))));
ret.merge(override_vt);
}
return ret;
}
@@ -361,8 +361,8 @@ PIValueTree PIValueTreeConversions::fromTextFile(const PIString & path) {
auto ofp = overrideFile(path);
if (PIFile::isExists(ofp)) {
PIFile of(ofp, PIIODevice::ReadOnly);
auto override = PIValueTreeConversions::fromText(&of);
ret.merge(override);
auto override_vt = PIValueTreeConversions::fromText(&of);
ret.merge(override_vt);
}
return ret;
}