From c99ef16f6109264bb008fefaa4b261ad55d113f9 Mon Sep 17 00:00:00 2001
From: svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f>
Date: Sat, 11 Aug 2007 13:12:06 +0000
Subject: got rid of the load error state forwarding

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

(limited to 'src/menuorg.cpp')

diff --git a/src/menuorg.cpp b/src/menuorg.cpp
index 57d424a..2dee9c6 100644
--- a/src/menuorg.cpp
+++ b/src/menuorg.cpp
@@ -41,14 +41,16 @@ const char* MenuOrgPlugin::Description(void)
 
 const char* MenuOrgPlugin::MainMenuEntry(void)
 {
-    if(_subMenuProvider->getSomeError())
+    if (!_subMenuProvider)
     {
         return tr("Failed to load config file");
     }
     else
+    {
         return NULL;
+    }
 }
-  
+
 const char *MenuOrgPlugin::CommandLineHelp(void)
 {
     // Return a string that describes all known command line options.
@@ -63,8 +65,20 @@ bool MenuOrgPlugin::ProcessArgs(int argc, char *argv[])
 
 bool MenuOrgPlugin::Initialize(void)
 {
-    _subMenuProvider = new SubMenuProvider();
+    XmlMenu xmlMenu;
+
+    MenuNode* menu = xmlMenu.LoadXmlMenu();
+    if (menu)
+    {
+        _subMenuProvider = new SubMenuProvider(menu);
+    }
+    else
+    {
+        _subMenuProvider = NULL;
+    }
+
     RegisterI18n(Phrases);
+
     return true;
 }
 
@@ -118,7 +132,7 @@ bool MenuOrgPlugin::SetupParse(const char *Name, const char *Value)
 
 bool MenuOrgPlugin::Service(const char *Id, void *Data)
 {
-    if (strcmp(Id, "SubMenuPatch-v0.1::SubMenuProvider") == 0 && _subMenuProvider->getSomeError() == false) 
+    if (strcmp(Id, "SubMenuPatch-v0.1::SubMenuProvider") == 0 && _subMenuProvider) 
     {
         ISubMenuProvider** ptr = (ISubMenuProvider**)Data;
         *ptr = _subMenuProvider;
-- 
cgit v1.2.3