fixed: don't crash if an (visualization) addon is disabled

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28611 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

Author: elupus

xbmc/utils/AddonManager.cpp

@@ -241,7 +241,7 @@ void CAddonMgr::UnregisterAddonMgrCallback(TYPE type)
   m_managers.erase(type);
 }
 
-bool CAddonMgr::HasAddons(const TYPE &type, const CONTENT_TYPE &content/*= CONTENT_NONE*/)
+bool CAddonMgr::HasAddons(const TYPE &type, const CONTENT_TYPE &content/*= CONTENT_NONE*/, bool enabledOnly/*= true*/)
 {
   if (m_addons.empty())
   {
@@ -253,7 +253,7 @@ bool CAddonMgr::HasAddons(const TYPE &type, const CONTENT_TYPE &content/*= CONTE
     return (m_addons.find(type) != m_addons.end());
 
   VECADDONS addons;
-  return GetAddons(type, addons, content, true);
+  return GetAddons(type, addons, content, enabledOnly);
 }
 
 void CAddonMgr::UpdateRepos()
@@ -327,7 +327,7 @@ bool CAddonMgr::GetAddons(const TYPE &type, VECADDONS &addons, const CONTENT_TYP
   return !addons.empty();
 }
 
-bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/)
+bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type/*=ADDON_UNKNOWN*/, bool enabledOnly/*= true*/)
 {
   CDateTimeSpan span;
   span.SetDateTimeSpan(0, 0, 0, ADDON_DIRSCAN_FREQ);
@@ -343,7 +343,10 @@ bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &typ
   if (m_idMap[str])
   {
     addon = m_idMap[str];
-    return true;
+    if(enabledOnly)
+      return !addon->Disabled();
+    else
+      return true;
   }
 
   VECADDONS &addons = m_addons[type];
@@ -354,7 +357,10 @@ bool CAddonMgr::GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &typ
     if ((*adnItr)->Name() == str || (type == ADDON_SCRAPER && (*adnItr)->LibName() == str))
     {
       addon = (*adnItr);
-      return true;
+      if(enabledOnly)
+        return !addon->Disabled();
+      else
+        return true;
     }
     adnItr++;
   }

xbmc/utils/AddonManager.h

@@ -105,8 +105,8 @@ namespace ADDON
 
     /* Addon access */
     bool GetDefault(const TYPE &type, AddonPtr &addon, const CONTENT_TYPE &content = CONTENT_NONE);
-    bool GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN);
-    bool HasAddons(const TYPE &type, const CONTENT_TYPE &content = CONTENT_NONE);
+    bool GetAddon(const CStdString &str, AddonPtr &addon, const TYPE &type = ADDON_UNKNOWN, bool enabledOnly = true);
+    bool HasAddons(const TYPE &type, const CONTENT_TYPE &content = CONTENT_NONE, bool enabledOnly = true);
     bool GetAddons(const TYPE &type, VECADDONS &addons, const CONTENT_TYPE &content = CONTENT_NONE, bool enabled = true);
     bool GetAllAddons(VECADDONS &addons, bool enabledOnly = true);
    CStdString GetString(const CStdString &id, const int number);