The name attribute is required for all nodes and checked by the dtd, no need

to check it again in the code.


git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5843 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

1 files changed, 20 insertions, 24 deletions

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index 6d34bbe..8badb41 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -93,32 +93,28 @@ void MenuConfiguration::ParseElement(const Element* element, MenuNode* menuNode)
         {
             const xmlpp::Attribute* nameAttribute = childElement->get_attribute("name");
 
-            if (nameAttribute)
-            {
-                string type = childElement->get_name();
-                string name = nameAttribute->get_value();
-
-                if ( type == "menu")
-                {
-                    MenuNode* subMenu = AddSubMenuNode(name, menuNode);
-                    ParseElement(childElement, subMenu);
-                }
-                else if (type == "system")
-                {
-                    AddSystemMenuNode(name, menuNode);
-                }
-                else if (type == "plugin")
-                {
-                    AddPluginMenuNode(name, menuNode);
-                }
-                else if (type == "command")
-                {
-                    string execute = childElement->get_attribute("execute")->get_value();
-                    const xmlpp::Attribute* confirmAttribute = childElement->get_attribute("confirm");
-                    bool confirm = confirmAttribute ? (confirmAttribute->get_value() == "yes") : false;
+            string type = childElement->get_name();
+            string name = nameAttribute->get_value();
 
+            if ( type == "menu")
+            {
+                MenuNode* subMenu = AddSubMenuNode(name, menuNode);
+                ParseElement(childElement, subMenu);
+            }
+            else if (type == "system")
+            {
+                AddSystemMenuNode(name, menuNode);
+            }
+            else if (type == "plugin")
+            {
+                AddPluginMenuNode(name, menuNode);
+            }
+            else if (type == "command")
+            {
+                string execute = childElement->get_attribute("execute")->get_value();
+                const xmlpp::Attribute* confirmAttribute = childElement->get_attribute("confirm");
+                bool confirm = confirmAttribute ? (confirmAttribute->get_value() == "yes") : false;
                     AddPluginMenuNode(name, execute, confirm, menuNode);
-                }
             }
         }
     }