From 483e0f419b246cb923bbe3f7ea5d18af29650a8e Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 19 Jan 2016 11:37:49 -0800 Subject: [PATCH] use mkpath to create new data directory --- libraries/shared/src/HifiConfigVariantMap.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/shared/src/HifiConfigVariantMap.cpp b/libraries/shared/src/HifiConfigVariantMap.cpp index b8743c8dfc..96fa2cd9b1 100644 --- a/libraries/shared/src/HifiConfigVariantMap.cpp +++ b/libraries/shared/src/HifiConfigVariantMap.cpp @@ -139,13 +139,16 @@ void HifiConfigVariantMap::loadMasterAndUserConfig(const QStringList& argumentLi // we have the old file and not the new file - time to copy the file // make the destination directory if it doesn't exist - QDir().mkdir(ServerPathUtils::getDataDirectory()); - - if (oldConfigFile.copy(_userConfigFilename)) { - qDebug() << "Migrated config file from" << oldConfigFilename << "to" << _userConfigFilename; - } else { - qWarning() << "Could not copy previous config file from" << oldConfigFilename << "to" << _userConfigFilename + auto dataDirectory = ServerPathUtils::getDataDirectory(); + if (QDir().mkpath(dataDirectory)) { + if (oldConfigFile.copy(_userConfigFilename)) { + qDebug() << "Migrated config file from" << oldConfigFilename << "to" << _userConfigFilename; + } else { + qWarning() << "Could not copy previous config file from" << oldConfigFilename << "to" << _userConfigFilename << "- please try to copy manually and restart."; + } + } else { + qWarning() << "Could not create application data directory" << dataDirectory << "- unable to migrate previous config file."; } } }