diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/submenuprovider.cc | 24 | ||||
| -rw-r--r-- | src/submenuprovider.h | 9 |
2 files changed, 13 insertions, 20 deletions
diff --git a/src/submenuprovider.cc b/src/submenuprovider.cc index 244dfa2..44b8943 100644 --- a/src/submenuprovider.cc +++ b/src/submenuprovider.cc @@ -125,16 +125,16 @@ void SubMenuProvider::EnterSubMenu(cOsdItem* item) bool SubMenuProvider::LeaveSubMenu() { isyslog("Call LeaveSubMenu() - _MenuIndex=%d", _MenuIndex); - - if (_MenuIndex != _MenuZuordnung[_MenuIndex][0][LEAVE]) - { - _nextMenuIndex = _MenuZuordnung[_MenuIndex][0][LEAVE]; - isyslog("LeaveSubMenu() - return true"); - return true; - } - else - { - isyslog("LeaveSubMenu() - return false"); - return false; - } + + if (_MenuIndex != _MenuZuordnung[_MenuIndex][0][LEAVE]) + { + _nextMenuIndex = _MenuZuordnung[_MenuIndex][0][LEAVE]; + isyslog("LeaveSubMenu() - return true"); + return true; + } + else + { + isyslog("LeaveSubMenu() - return false"); + return false; + } } diff --git a/src/submenuprovider.h b/src/submenuprovider.h index a1affb3..f3621af 100644 --- a/src/submenuprovider.h +++ b/src/submenuprovider.h @@ -5,20 +5,13 @@ using namespace SubMenuPatch; -/* -struct sSubMenu -{ - int MainMenuIndex; - int NextMenuIndex; -}; -*/ const unsigned int ENTER = 0; const unsigned int LEAVE = 1; class SubMenuProvider: public ISubMenuProvider { private: - MainMenuItemsList _osdItems; // Enthält das aktuelle MenüItem (kann weg) + MainMenuItemsList _osdItems; // Enthält das aktuelle MenüItem MainMenuItemsList _myOsdItems[5]; // Enthält alle verfügbaren Menüs int _MenuIndex; // Der Index des aktuellen Menüs |