From 4afb6992c35286b8eb6418485d7115224d243eab Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 19 Jan 2016 14:35:21 -0800 Subject: [PATCH] Move entities resources into /entities --- assignment-client/src/octree/OctreeServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 387161b464..a639254b4c 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -1147,7 +1147,7 @@ void OctreeServer::domainSettingsRequestComplete() { // If there is, let's copy it over to our target persist directory QString oldResourcesDirectory = QCoreApplication::applicationDirPath(); auto oldPersistPath = QDir(oldResourcesDirectory).absoluteFilePath(_persistFilename); - auto persistPath = ServerPathUtils::getDataFilePath(_persistFilename); + auto persistPath = ServerPathUtils::getDataFilePath("entities/" + QString(_persistFilename)); if (oldPersistPath != persistPath && !QFile::exists(persistPath)) { qDebug() << "Persist file does not exist, checking for existence of persist file next to application"; if (QFile::exists(oldPersistPath)) {