From 8c748c9a7bcf7d960b2c76b52a42a6b3b1707334 Mon Sep 17 00:00:00 2001 From: svntcreutz Date: Fri, 27 Jul 2007 17:27:06 +0000 Subject: check for Commands.Count() added git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5656 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f --- src/xmlmenu.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/xmlmenu.cpp') diff --git a/src/xmlmenu.cpp b/src/xmlmenu.cpp index 84d8e31..d1f318e 100644 --- a/src/xmlmenu.cpp +++ b/src/xmlmenu.cpp @@ -82,15 +82,19 @@ void XmlMenu::parseNode(const Node* a_node, unsigned int Parent, unsigned int It const Attribute* attribute = *iter; //cout << Parent << "-" << MainMenuIndex << "-" << myMenuNr << "-SystemItem=" << attribute->get_value() << endl; isyslog("%d-%d-%d-SystemItem=%s",Parent,ItemIndex,MenuIndex,attribute->get_value().data()); - if(MenuIndex > 0) + eOSState ItemeOSState = geteOSState(attribute->get_value()); + if ((ItemeOSState == osCommands && Commands.Count()) || ItemeOSState != osCommands) { - isyslog(" - add to _subMenu[%d]",MenuIndex); - _subMenu[MenuIndex]->AddChild(new VdrMenuItem(tr(attribute->get_value().data()), geteOSState(attribute->get_value()))); - } - else - { - isyslog(" - add to _rootMenuNode"); - _rootMenuNode.AddChild(new VdrMenuItem(tr(attribute->get_value().data()), geteOSState(attribute->get_value()))); + if(MenuIndex > 0) + { + isyslog(" - add to _subMenu[%d]",MenuIndex); + _subMenu[MenuIndex]->AddChild(new VdrMenuItem(tr(attribute->get_value().data()), geteOSState(attribute->get_value()))); + } + else + { + isyslog(" - add to _rootMenuNode"); + _rootMenuNode.AddChild(new VdrMenuItem(tr(attribute->get_value().data()), geteOSState(attribute->get_value()))); + } } } } -- cgit v1.2.3