diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/MainMenuItemsProvider.cpp | 2 | ||||
| -rw-r--r-- | src/OsdItemDefinition.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
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) |