From 68598f9b634876c834e9be6090a2392901d7513f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 13 Nov 2013 14:56:04 +0100
Subject: [PATCH] fixed handling of user directory defaultfilters file; some
 cleanup

---
 apps/opencs/model/doc/document.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/opencs/model/doc/document.cpp b/apps/opencs/model/doc/document.cpp
index 4ee3c461f..27f4f498a 100644
--- a/apps/opencs/model/doc/document.cpp
+++ b/apps/opencs/model/doc/document.cpp
@@ -2245,33 +2245,39 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration, co
         mData.setDescription ("");
         mData.setAuthor ("");
     }
+
+    bool filtersFound = false;
+
     if (boost::filesystem::exists (mProjectPath))
     {
-        std::cout<<"Loading file."<<std::endl;
-        getData().loadFile (mProjectPath, false, true);
+        filtersFound = true;
     }
     else
     {
-        std::cout<<"Attemp to use filters file as template."<<std::endl;
         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 {
+            filtersFound = true;
+        }
+        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(filters, mProjectPath);
-            } else {
-                std::cout<<filters<<" could not be found!"<<std::endl;
+                filtersFound = true;
             }
-            getData().loadFile (mProjectPath, false, true);
         }
     }
+
+    if (filtersFound)
+        getData().loadFile (mProjectPath, false, true);
+
     addOptionalGmsts();
     addOptionalGlobals();