From 821d0c5c2d7e48b72259eefcebdb5da4712c35fa Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Wed, 13 Nov 2013 11:38:29 +0100
Subject: [PATCH] Corrected filter template loading.

---
 apps/opencs/model/doc/document.cpp | 32 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 590a19439..4ee3c461f 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2245,29 +2245,33 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, co
         mData.setDescription ("");
         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
     {
-        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);
-        }
-        else
-        {
-            boost::filesystem::path locCustomFiltersPath (configuration.getUserPath());
-            locCustomFiltersPath /= "defaultfilters";
-            if (boost::filesystem::exists(locCustomFiltersPath))
+            std::cout<<"Found custom filters file ("<<locCustomFiltersPath<<")."<<std::endl;
+            boost::filesystem::copy_file (locCustomFiltersPath, mProjectPath);
+        } else {
+            boost::filesystem::path filters(mResDir);
+            filters /= "defaultfilters";
+            std::cout<<"Attempt to read defaultfilters from: "<<filters<<std::endl;
+            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);
+            } else {
+                std::cout<<filters<<" could not be found!"<<std::endl;
             }
             getData().loadFile (mProjectPath, false, true);
         }
     }
-
     addOptionalGmsts();
     addOptionalGlobals();