diff --git a/libs/main/serialization/pivaluetree_conversions.cpp b/libs/main/serialization/pivaluetree_conversions.cpp index 1a84d15c..2b9f0f14 100644 --- a/libs/main/serialization/pivaluetree_conversions.cpp +++ b/libs/main/serialization/pivaluetree_conversions.cpp @@ -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; }