summaryrefslogtreecommitdiff
path: root/src/configuration.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-26 00:41:35 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-26 00:41:35 +0300
commit5344dc6cd9156a9b67da834c9b5b4be00a62992a (patch)
treee71a20fbc231ccec6e53a718758eea447cfc7069 /src/configuration.cpp
parent02822f84a25b261f02f5928a6cbefe103cd9491e (diff)
downloadmanaplus-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.gz
manaplus-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.bz2
manaplus-5344dc6cd9156a9b67da834c9b5b4be00a62992a.tar.xz
manaplus-5344dc6cd9156a9b67da834c9b5b4be00a62992a.zip
Add missing checks into other files.
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r--src/configuration.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp
index d5af8c79f..b43dd88cf 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -673,11 +673,14 @@ bool Configuration::resetBoolValue(const std::string &key)
}
-void ConfigurationObject::initFromXML(const XmlNodePtrConst parent_node)
+void ConfigurationObject::initFromXML(const XmlNodePtrConst parentNode)
{
clear();
- for_each_xml_child_node(node, parent_node)
+ if (!parentNode)
+ return;
+
+ for_each_xml_child_node(node, parentNode)
{
if (xmlNameEqual(node, "list"))
{