diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp index dd7a1e780..ec1775ac8 100644 --- a/apps/openmw/main.cpp +++ b/apps/openmw/main.cpp @@ -160,7 +160,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat engine.enableFSStrict(variables["fs-strict"].as()); Files::PathContainer dataDirs(variables["data"].as()); - cfgMgr.processPaths(dataDirs); std::string local(variables["data-local"].as()); if (!local.empty()) @@ -173,6 +172,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat dataDirs.push_back(cfgMgr.getLocalPath()); } + cfgMgr.processPaths(dataDirs); + engine.setDataDirs(dataDirs); engine.setResourceDir(variables["resources"].as()); diff --git a/components/files/windowspath.cpp b/components/files/windowspath.cpp index e81041272..cf73b3728 100644 --- a/components/files/windowspath.cpp +++ b/components/files/windowspath.cpp @@ -64,7 +64,7 @@ boost::filesystem::path WindowsPath::getLocalPath() const boost::filesystem::path WindowsPath::getGlobalDataPath() const { - return getGlobalConfigPath(); + return getGlobalPath(); } boost::filesystem::path WindowsPath::getInstallPath() const