fixed childlock stuff

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

1 files changed, 6 insertions, 9 deletions

diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index 916034f..6e0bb00 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -45,7 +45,10 @@ MenuItemDefinitions* MainMenuItemsProvider::MainMenuItems()
     for (MenuNodeList::iterator i = _currentMenu->Childs().begin();
       i != _currentMenu->Childs().end(); i++)
     {
-        _currentMainMenuItems.push_back((*i)->CreateMenuItemDefinition());
+        if (!(*i)->IsHidden())
+        {
+            _currentMainMenuItems.push_back((*i)->CreateMenuItemDefinition());
+        }
     }
 
     return &_currentMainMenuItems;
@@ -72,10 +75,7 @@ void MainMenuItemsProvider::EnterSubMenu(cOsdItem* item)
     int itemIndex = IndexOfCustomOsdItem(item);
     if (itemIndex >= 0)
     {
-        if (!ChildLock::IsMenuProtected(item->Text()))
-        {
-            _currentMenu = _currentMenu->Childs().at(itemIndex);
-        }
+        _currentMenu = _currentMenu->Childs().at(itemIndex);
     }
 }
 
@@ -97,10 +97,7 @@ cOsdMenu* MainMenuItemsProvider::Execute(cOsdItem* item)
     int itemIndex = IndexOfCustomOsdItem(item);
     if (itemIndex >= 0)
     {
-        if (!ChildLock::IsMenuProtected(item->Text()))
-        {
-            return _currentMenu->Childs().at(itemIndex)->Execute();
-        }
+        return _currentMenu->Childs().at(itemIndex)->Execute();
     }
 }