Merge pull request #9473 from FernetMenta/inputstream

BinaryAddonCache: ignore disabled addons
xbmc · Mar 29, 2016 · 90c3fff · 90c3fff
2 parents 36675da + c4abf69
commit 90c3fff
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/xbmc/addons/BinaryAddonCache.cpp b/xbmc/addons/BinaryAddonCache.cpp
@@ -51,7 +51,8 @@ void CBinaryAddonCache::GetAddons(VECADDONS& addons, const TYPE& type)
   {
     for (auto &addon : it->second)
     {
-      addons.push_back(addon);
+      if (!CAddonMgr::GetInstance().IsAddonDisabled(addon->ID()))
+        addons.push_back(addon);
     }
   }
 }
@@ -70,7 +71,7 @@ void CBinaryAddonCache::Update()
   for (auto &addonType : m_addonsToCache)
   {
     VECADDONS addons;
-    CAddonMgr::GetInstance().GetAddons(addons, addonType);
+    CAddonMgr::GetInstance().GetInstalledAddons(addons, addonType);
     addonmap.insert(AddonMap::value_type(addonType, addons));
   }