From 742b2a22bdcb69e6f615a284065ba2696e7bc261 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 May 2016 22:00:30 +0300 Subject: Allow set skip error flag for configuration loading. --- src/client.cpp | 3 ++- src/configuration.cpp | 7 +++++-- src/configuration.h | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/client.cpp b/src/client.cpp index 19f3a0937..3ed950101 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -1820,7 +1820,8 @@ void Client::action(const ActionEvent &event) void Client::initFeatures() { features.init(paths.getStringValue("featuresFile"), - UseResman_true); + UseResman_true, + SkipError_true); features.setDefaultValues(getFeaturesDefaults()); settings.fixDeadAnimation = features.getBoolValue("fixDeadAnimation"); } diff --git a/src/configuration.cpp b/src/configuration.cpp index fd15fec84..ef3c6cf2a 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -737,10 +737,13 @@ void ConfigurationObject::initFromXML(const XmlNodePtrConst parentNode) } void Configuration::init(const std::string &filename, - const UseResman useResManager) + const UseResman useResManager, + const SkipError skipError) { cleanDefaults(); - XML::Document doc(filename, useResManager, SkipError_false); + XML::Document doc(filename, + useResManager, + skipError); mFilename = filename; mUseResManager = useResManager; diff --git a/src/configuration.h b/src/configuration.h index a9d5fdb21..1c91ae1b8 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -245,7 +245,8 @@ class Configuration final : public ConfigurationObject * @param useResManager Make use of the resource manager. */ void init(const std::string &filename, - const UseResman useResManager = UseResman_false); + const UseResman useResManager = UseResman_false, + const SkipError skipError = SkipError_false); void reInit(); -- cgit v1.2.3-60-g2f50