[pvr] removed (wrong) pvr specific hack to show 'add-on disabled' labels

fetzerch · Dec 31, 2012 · 328884d · 328884d
1 parent 2d22175
commit 328884d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/xbmc/filesystem/AddonsDirectory.cpp b/xbmc/filesystem/AddonsDirectory.cpp
@@ -203,6 +203,7 @@ void CAddonsDirectory::GenerateListing(CURL &path, VECADDONS& addons, CFileItemL
 {
   CStdString xbmcPath = CSpecialProtocol::TranslatePath("special://xbmc/addons");
   items.ClearItems();
+  CAddonDatabase db;
   for (unsigned i=0; i < addons.size(); i++)
   {
     AddonPtr addon = addons[i];
@@ -214,8 +215,11 @@ void CAddonsDirectory::GenerateListing(CURL &path, VECADDONS& addons, CFileItemL
     AddonPtr addon2;
     if (CAddonMgr::Get().GetAddon(addon->ID(),addon2))
       pItem->SetProperty("Addon.Status",g_localizeStrings.Get(305));
-    else if ((addon->Type() == ADDON_PVRDLL) && (CStdString(pItem->GetProperty("Addon.Path").asString()).Left(xbmcPath.size()).Equals(xbmcPath)))
+    else if (db.Open() && db.IsAddonDisabled(addon->ID()))
+    {
       pItem->SetProperty("Addon.Status",g_localizeStrings.Get(24023));
+      db.Close();
+    }
 
     if (!addon->Props().broken.IsEmpty())
       pItem->SetProperty("Addon.Status",g_localizeStrings.Get(24098));