From 830d8e01713add5856f44a5246eb65781458d0b8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 13 Aug 2012 00:10:19 +0100
Subject: Tweaks for more real-life DCPs; beginning of subtitle support.

---
 src/xml.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/xml.cc')

diff --git a/src/xml.cc b/src/xml.cc
index 72dfe1bb..206cb5f0 100644
--- a/src/xml.cc
+++ b/src/xml.cc
@@ -62,9 +62,14 @@ XMLNode::string_node (string name)
 	xmlpp::Node* node = xml_node (name);
 	
         xmlpp::Node::NodeList c = node->get_children ();
-	if (c.size() != 1) {
+
+	if (c.size() > 1) {
 		throw XMLError ("unexpected content in XML node");
 	}
+
+	if (c.empty ()) {
+		return "";
+	}
 	
         xmlpp::ContentNode const * v = dynamic_cast<xmlpp::ContentNode const *> (c.front());
 	if (!v) {
-- 
cgit v1.2.3