diff options
| -rw-r--r-- | src/mainmenuitemsprovider.cpp | 1 | ||||
| -rw-r--r-- | src/menuconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/systemmenunode.cpp | 2 | ||||
| -rw-r--r-- | src/systemmenunode.h | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp index 86f91d8..05fb021 100644 --- a/src/mainmenuitemsprovider.cpp +++ b/src/mainmenuitemsprovider.cpp @@ -101,6 +101,7 @@ cOsdMenu* MainMenuItemsProvider::Execute(cOsdItem* item) { return _currentMenu->Childs().at(itemIndex)->Execute(); } + return NULL; } int MainMenuItemsProvider::IndexOfCustomOsdItem(cOsdItem* item) diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp index 86a8d8e..a51f3ce 100644 --- a/src/menuconfiguration.cpp +++ b/src/menuconfiguration.cpp @@ -151,7 +151,7 @@ MenuNode* MenuConfiguration::AddSubMenuNode(string name, MenuNode* menu) void MenuConfiguration::AddSystemMenuNode(string name, string title, MenuNode* menu) { - menu->AddChild(new SystemMenuNode(title, MenuTextToVdrState(name))); + menu->AddChild(new SystemMenuNode(MenuTextToVdrState(name), title)); } void MenuConfiguration::AddPluginMenuNode(string pluginName, string title, MenuNode* menu) diff --git a/src/systemmenunode.cpp b/src/systemmenunode.cpp index 53ab4db..8098960 100644 --- a/src/systemmenunode.cpp +++ b/src/systemmenunode.cpp @@ -25,7 +25,7 @@ #include "osditemdefinition.h" #include "childlock.h" -SystemMenuNode::SystemMenuNode(std::string text, eOSState state) +SystemMenuNode::SystemMenuNode(eOSState state, std::string text) { _text = text; _state = state; diff --git a/src/systemmenunode.h b/src/systemmenunode.h index bba1dc0..5e09cf5 100644 --- a/src/systemmenunode.h +++ b/src/systemmenunode.h @@ -34,7 +34,7 @@ class SystemMenuNode: public MenuNode eOSState _state; public: - SystemMenuNode(std::string text, eOSState state); + SystemMenuNode(eOSState state, std::string text); IMenuItemDefinition* CreateMenuItemDefinition(); bool IsHidden(); }; |