From d5a00a320043f5782ebc489285c89943b667e094 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 12 May 2016 00:18:57 +0300
Subject: Add skipError parameter to loadXml functions.

This allow not show errors for some not main xml files.
---
 src/resources/db/sounddb.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/resources/db/sounddb.cpp')

diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp
index 238e17b51..3268a3e9c 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -38,16 +38,17 @@ namespace
 void SoundDB::load()
 {
     unload();
-    loadXmlFile(paths.getStringValue("soundsFile"));
-    loadXmlFile(paths.getStringValue("soundsPatchFile"));
+    loadXmlFile(paths.getStringValue("soundsFile"), SkipError_false);
+    loadXmlFile(paths.getStringValue("soundsPatchFile"), SkipError_true);
     loadXmlDir("soundsPatchDir", loadXmlFile);
 }
 
-void SoundDB::loadXmlFile(const std::string &fileName)
+void SoundDB::loadXmlFile(const std::string &fileName,
+                          const SkipError skipError)
 {
     XML::Document *doc = new XML::Document(fileName,
         UseResman_true,
-        SkipError_false);
+        skipError);
     const XmlNodePtrConst root = doc->rootNode();
 
     if (!root || !xmlNameEqual(root, "sounds"))
@@ -62,7 +63,7 @@ void SoundDB::loadXmlFile(const std::string &fileName)
         {
             const std::string name = XML::getProperty(node, "name", "");
             if (!name.empty())
-                loadXmlFile(name);
+                loadXmlFile(name, skipError);
             continue;
         }
         else if (xmlNameEqual(node, "sound"))
-- 
cgit v1.2.3-60-g2f50