diff options
| author | etobi <git@e-tobi.net> | 2012-02-05 19:36:35 +0100 |
|---|---|---|
| committer | etobi <git@e-tobi.net> | 2012-02-05 19:36:35 +0100 |
| commit | f5a6eddf8cde82e8d9e86bbe51337c40363d14b6 (patch) | |
| tree | 4c4ee4337ebbb5803e28c38adeef3a8e2bfc1db0 | |
| parent | 2cb6a552bcc9aebbebc967bcb285c0f7ed24fbb9 (diff) | |
| download | vdr-plugin-menuorg-f5a6eddf8cde82e8d9e86bbe51337c40363d14b6.tar.gz vdr-plugin-menuorg-f5a6eddf8cde82e8d9e86bbe51337c40363d14b6.tar.bz2 | |
When entering root menu, always select the first menu entry (Closes #792)
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | src/MainMenuItemsProvider.cpp | 2 | ||||
| -rw-r--r-- | src/OsdItemDefinition.cpp | 1 |
3 files changed, 4 insertions, 2 deletions
@@ -58,4 +58,5 @@ VDR Plugin 'menuorg' Revision History 2011-02-05: Version 0.4.5 -- Added Slowak translation (Closes #563)
\ No newline at end of file +- Added Slowak translation (Closes #563) +- When entering root menu, always select the first menu entry (Closes #792) diff --git a/src/MainMenuItemsProvider.cpp b/src/MainMenuItemsProvider.cpp index 28e07cb..e5dcc57 100644 --- a/src/MainMenuItemsProvider.cpp +++ b/src/MainMenuItemsProvider.cpp @@ -32,7 +32,6 @@ MainMenuItemsProvider::MainMenuItemsProvider(MenuConfigurationRepository& menuCo :_menuConfigurationRepository(menuConfigurationRepository), _pluginConfiguration(pluginConfiguration) { EnterRootMenu(); - _previousMenu = NULL; } MainMenuItemsProvider::~MainMenuItemsProvider() @@ -78,6 +77,7 @@ void MainMenuItemsProvider::ResetMainMenuItemsList() void MainMenuItemsProvider::EnterRootMenu() { _currentMenu = _menuConfigurationRepository.Load(_pluginConfiguration.UnconfiguredPluginsIncluded()); + _previousMenu = NULL; // TODO; Handling of unloadable config file should not be done here } diff --git a/src/OsdItemDefinition.cpp b/src/OsdItemDefinition.cpp index e70e120..5d8a5ad 100644 --- a/src/OsdItemDefinition.cpp +++ b/src/OsdItemDefinition.cpp @@ -22,6 +22,7 @@ */ #include "OsdItemDefinition.h" +#include <cstddef> OsdItemDefinition::OsdItemDefinition(MenuNode* menuNode, cOsdItem* osdItem, bool isSelected) :MenuItemDefinition(menuNode) |