diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp index 5d21473fd8..b3920e70bc 100644 --- a/libraries/shared/src/HifiConfigVariantMap.cpp +++ b/libraries/shared/src/HifiConfigVariantMap.cpp @@ -125,14 +125,21 @@ void HifiConfigVariantMap::loadMasterAndUserConfig(const QStringList& argumentLi // as of 1/19/2016 this path was moved so we attempt a migration for first run post migration here // figure out what the old path was + + // if our build version is "dev" we should migrate from a different organization folder + auto oldConfigFilename = QString("%1/%2/%3/%4").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation), - QCoreApplication::organizationName(), - QCoreApplication::applicationName(), - USER_CONFIG_FILE_NAME); + 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 }; if (!newConfigFile.exists()) { + QFile oldConfigFile { oldConfigFilename }; if (oldConfigFile.exists()) {