Don't call teh Plugin's main menu entry, before the main menu is requested.

Some Plugins may do Things in cPlugin::MainMenuEntry() that may require
cPlugin::Initialize() and cPlugin::Start() to be called first. (e.g. vdr-burn)


git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@5982 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f

1 files changed, 2 insertions, 10 deletions

diff --git a/src/menuconfiguration.cpp b/src/menuconfiguration.cpp
index 9a24e85..f096ba2 100644
--- a/src/menuconfiguration.cpp
+++ b/src/menuconfiguration.cpp
@@ -138,7 +138,7 @@ void MenuConfiguration::AddPluginMenuNode(string pluginName, MenuNode* menu)
     if (FindPluginByName(pluginName, plugin, pluginIndex))
     {
         _configuredPlugins.push_back(pluginName);
-        AddPluginMenuNode(plugin, pluginIndex, menu);
+        menu->AddChild(new PluginMenuNode(plugin, pluginIndex));
     }
 }
 
@@ -198,7 +198,7 @@ void MenuConfiguration::AddUnconfiguredPlugins(MenuNode* menu)
     {
         if (find(_configuredPlugins.begin(), _configuredPlugins.end(), plugin->Name()) == _configuredPlugins.end())
         {
-            AddPluginMenuNode(plugin, i, menu);
+            menu->AddChild(new PluginMenuNode(plugin, i));
         }
         i++;
     }
@@ -208,11 +208,3 @@ void MenuConfiguration::AddCommandMenuNode(string name, string command, bool con
 {
     menu->AddChild(new CommandMenuNode(name, command, confirm));
 }
-
-void MenuConfiguration::AddPluginMenuNode(cPlugin* plugin, int pluginIndex, MenuNode* menu)
-{
-    if (plugin->MainMenuEntry())
-    {
-        menu->AddChild(new PluginMenuNode(plugin, pluginIndex));
-    }
-}