handle weird nested path on windows

This commit is contained in:
Stephen Birarda 2016-01-21 14:03:45 -08:00
parent cddb8cd3f0
commit aa2e55a5a0

View file

@ -127,16 +127,14 @@ void HifiConfigVariantMap::loadMasterAndUserConfig(const QStringList& argumentLi
// figure out what the old path was
// if our build version is "dev" we should migrate from a different organization folder
auto oldOrganizationName = QCoreApplication::organizationName();
if (oldOrganizationName == "High Fidelity - dev") {
oldOrganizationName = "High Fidelity";
}
auto oldConfigFilename = QString("%1/%2/%3/%4").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation),
oldOrganizationName,
QCoreApplication::organizationName(),
QCoreApplication::applicationName(),
USER_CONFIG_FILE_NAME);
oldConfigFilename = oldConfigFilename.replace("High Fidelity - dev", "High Fidelity");
// check if there's already a config file at the new path
QFile newConfigFile { _userConfigFilename };