From a1059732ffdca86f4dc01afe25788e8e428b9aec Mon Sep 17 00:00:00 2001
From: svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Sun, 26 Aug 2007 13:31:42 +0000
Subject: reparse the menu each time the the root menu is requested

git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6003 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
---
 src/mainmenuitemsprovider.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/mainmenuitemsprovider.cpp')

diff --git a/src/mainmenuitemsprovider.cpp b/src/mainmenuitemsprovider.cpp
index 6e0bb00..e0b6a7f 100644
--- a/src/mainmenuitemsprovider.cpp
+++ b/src/mainmenuitemsprovider.cpp
@@ -26,16 +26,17 @@
 #include "pluginmenunode.h"
 #include <vdr/plugin.h>
 #include "childlock.h"
+#include "menuconfiguration.h"
 
-MainMenuItemsProvider::MainMenuItemsProvider(MenuNode* rootMenu)
+MainMenuItemsProvider::MainMenuItemsProvider(MenuConfiguration& menuConfiguration)
+    :_menuConfiguration(menuConfiguration)
 {
-     _currentMenu = _rootMenu = rootMenu;
+    EnterRootMenu();
 }
 
 MainMenuItemsProvider::~MainMenuItemsProvider()
 {
     ResetMainMenuItemsList();
-    delete _rootMenu;
 }
 
 MenuItemDefinitions* MainMenuItemsProvider::MainMenuItems()
@@ -67,7 +68,7 @@ void MainMenuItemsProvider::ResetMainMenuItemsList()
 
 void MainMenuItemsProvider::EnterRootMenu()
 {
-    _currentMenu = _rootMenu;
+     _currentMenu = _rootMenu = _menuConfiguration.MenuTree();;
 }
 
 void MainMenuItemsProvider::EnterSubMenu(cOsdItem* item)
-- 
cgit v1.2.3