mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-28 07:32:00 -04:00
some fixes for the merged filter branch
This commit is contained in:
parent
fdba029566
commit
3146af34d6
@ -89,7 +89,7 @@ void CS::Editor::setupDataFiles()
|
|||||||
|
|
||||||
dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
|
dataDirs.insert (dataDirs.end(), dataLocal.begin(), dataLocal.end());
|
||||||
|
|
||||||
mDocumentManager.setResourceDir(mCfgMgr.getGlobalDataPath());
|
mDocumentManager.setResourceDir (variables["resources"].as<std::string>());
|
||||||
|
|
||||||
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
|
for (Files::PathContainer::const_iterator iter = dataDirs.begin(); iter != dataDirs.end(); ++iter)
|
||||||
{
|
{
|
||||||
|
@ -2258,7 +2258,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, co
|
|||||||
locCustomFiltersPath /= "defaultfilters";
|
locCustomFiltersPath /= "defaultfilters";
|
||||||
if (boost::filesystem::exists(locCustomFiltersPath))
|
if (boost::filesystem::exists(locCustomFiltersPath))
|
||||||
{
|
{
|
||||||
boost::filesystem::copy(locCustomFiltersPath, mProjectPath);
|
boost::filesystem::copy_file (locCustomFiltersPath, mProjectPath);
|
||||||
} else {
|
} else {
|
||||||
boost::filesystem::path filters(mResDir);
|
boost::filesystem::path filters(mResDir);
|
||||||
filters /= "defaultfilters";
|
filters /= "defaultfilters";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user