summaryrefslogtreecommitdiff
path: root/src/mainmenuitemsprovider.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainmenuitemsprovider.cpp')
-rw-r--r--src/mainmenuitemsprovider.cpp15
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();
}
}