From cddb8cd3f0ef2f34010724bd834e06e6ac7b32c2 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 21 Jan 2016 13:57:24 -0800 Subject: [PATCH] migrate domain-server config from single org name --- libraries/shared/src/HifiConfigVariantMap.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp index 5d21473fd8..57f1954dbc 100644 --- a/libraries/shared/src/HifiConfigVariantMap.cpp +++ b/libraries/shared/src/HifiConfigVariantMap.cpp @@ -125,14 +125,23 @@ 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 oldOrganizationName = QCoreApplication::organizationName(); + if (oldOrganizationName == "High Fidelity - dev") { + oldOrganizationName = "High Fidelity"; + } + auto oldConfigFilename = QString("%1/%2/%3/%4").arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation), - QCoreApplication::organizationName(), - QCoreApplication::applicationName(), - USER_CONFIG_FILE_NAME); + oldOrganizationName, + QCoreApplication::applicationName(), + USER_CONFIG_FILE_NAME); + // check if there's already a config file at the new path QFile newConfigFile { _userConfigFilename }; if (!newConfigFile.exists()) { + QFile oldConfigFile { oldConfigFilename }; if (oldConfigFile.exists()) {