From 8bfc700c8c2155247901c5a70c613b40ab4572ed Mon Sep 17 00:00:00 2001
From: Stuart Morgan <smorgan@mythtv.org>
Date: Sun, 18 Nov 2012 22:18:49 +0000
Subject: [PATCH] Only display plugin menu items if the plugin has successfully
 loaded

---
 mythtv/libs/libmythui/myththemedmenu.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mythtv/libs/libmythui/myththemedmenu.cpp b/mythtv/libs/libmythui/myththemedmenu.cpp
index 4a3fe9e6d38..e87d360a2fb 100644
--- a/mythtv/libs/libmythui/myththemedmenu.cpp
+++ b/mythtv/libs/libmythui/myththemedmenu.cpp
@@ -29,6 +29,9 @@
 #include "mythversion.h"
 #include "mythdate.h"
 
+// libmythbase headers
+#include "mythplugin.h"
+
 MythThemedMenuState::MythThemedMenuState(MythScreenStack *parent,
                                          const QString &name)
     : MythScreenType(parent, name),
@@ -842,6 +845,7 @@ bool MythThemedMenu::findDepends(const QString &fileList)
 {
     QStringList files = fileList.split(" ");
     QString filename;
+    MythPluginManager *pluginManager = gCoreContext->GetPluginManager();
 
     for (QStringList::Iterator it = files.begin(); it != files.end(); ++it )
     {
@@ -849,10 +853,9 @@ bool MythThemedMenu::findDepends(const QString &fileList)
         if (!filename.isEmpty() && filename.endsWith(".xml"))
             return true;
 
-        QString newname = FindPluginName(*it);
-
-        QFile checkFile(newname);
-        if (checkFile.exists())
+        // Has plugin by this name been successfully loaded
+        MythPlugin *plugin = pluginManager->GetPlugin(*it);
+        if (plugin)
             return true;
     }