mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Corrected filter template loading.

Browse Source
This commit is contained in:
Marek Kochanowicz 2013-11-13 11:38:29 +01:00
parent 08f8c93a71
commit 821d0c5c2d
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/opencs/model/doc/document.cpp
View File

@ -2245,29 +2245,33 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, co
mData.setDescription (""); mData.setDescription ("");
mData.setAuthor (""); mData.setAuthor ("");
} }
/// \todo un-outcomment the else, once loading an existing content file works properly again. if (boost::filesystem::exists (mProjectPath))
{
std::cout<<"Loading file."<<std::endl;
getData().loadFile (mProjectPath, false, true);
}
else else
{ {
if (boost::filesystem::exists (mProjectPath)) std::cout<<"Attemp to use filters file as template."<<std::endl;
boost::filesystem::path locCustomFiltersPath (configuration.getUserPath());
locCustomFiltersPath /= "defaultfilters";
if (boost::filesystem::exists(locCustomFiltersPath))
{ {
getData().loadFile (mProjectPath, false, true); std::cout<<"Found custom filters file ("<<locCustomFiltersPath<<")."<<std::endl;
} boost::filesystem::copy_file (locCustomFiltersPath, mProjectPath);
else } else {
{ boost::filesystem::path filters(mResDir);
boost::filesystem::path locCustomFiltersPath (configuration.getUserPath()); filters /= "defaultfilters";
locCustomFiltersPath /= "defaultfilters"; std::cout<<"Attempt to read defaultfilters from: "<<filters<<std::endl;
if (boost::filesystem::exists(locCustomFiltersPath)) if (boost::filesystem::exists(filters))
{ {
boost::filesystem::copy_file (locCustomFiltersPath, mProjectPath);
} else {
boost::filesystem::path filters(mResDir);
filters /= "defaultfilters";
boost::filesystem::copy_file(filters, mProjectPath); boost::filesystem::copy_file(filters, mProjectPath);
} else {
std::cout<<filters<<" could not be found!"<<std::endl;
} }
getData().loadFile (mProjectPath, false, true); getData().loadFile (mProjectPath, false, true);
} }
} }
addOptionalGmsts(); addOptionalGmsts();
addOptionalGlobals(); addOptionalGlobals();