teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #1507 from AnyOldName3/data-local-fix

Browse source 
Fix the loading of 'data-local' lines which I broke
This commit is contained in:
scrawl 2017-10-18 09:59:43 +00:00 committed by GitHub
commit 21a705fb75
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/editor.cpp
View file

@ -127,7 +127,11 @@ std::pair<Files::PathContainer, std::vector<std::string> > CS::Editor::readConfi
} }
std::string local = variables["data-local"].as<Files::EscapeHashString>().toStdString(); std::string local = variables["data-local"].as<Files::EscapeHashString>().toStdString();
if (!local.empty()) { if (!local.empty())
{
if (local.front() == '\"')
local = local.substr(1, local.length() - 2);
dataLocal.push_back(Files::PathContainer::value_type(local)); dataLocal.push_back(Files::PathContainer::value_type(local));
} }

3
apps/openmw/main.cpp
View file

@ -194,6 +194,9 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
std::string local(variables["data-local"].as<Files::EscapeHashString>().toStdString()); std::string local(variables["data-local"].as<Files::EscapeHashString>().toStdString());
if (!local.empty()) if (!local.empty())
{ {
if (local.front() == '\"')
local = local.substr(1, local.length() - 2);
dataDirs.push_back(Files::PathContainer::value_type(local)); dataDirs.push_back(Files::PathContainer::value_type(local));
} }