From 3146af34d642a28b15b55f7eb9999d8ac50168a0 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 21 Oct 2013 19:28:57 +0200
Subject: [PATCH] some fixes for the merged filter branch

---
 apps/opencs/editor.cpp             | 2 +-
 apps/opencs/model/doc/document.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 94faa713b..a05b515d3 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -89,7 +89,7 @@ void CS::Editor::setupDataFiles()
 
     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)
     {
diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 34bdc056f..cc886f9cc 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2258,7 +2258,7 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, co
             locCustomFiltersPath /= "defaultfilters";
             if (boost::filesystem::exists(locCustomFiltersPath))
             {
-                boost::filesystem::copy(locCustomFiltersPath, mProjectPath);
+                boost::filesystem::copy_file (locCustomFiltersPath, mProjectPath);
             } else {
                 boost::filesystem::path filters(mResDir);
                 filters /= "defaultfilters";