changed: do not fail when loading optional scraper imports
authorvdrfan <vdrfan-nospam-@xbmc.org>
Sun, 15 Jan 2012 15:57:07 +0000 (16:57 +0100)
committervdrfan <vdrfan-nospam-@xbmc.org>
Sun, 15 Jan 2012 16:03:39 +0000 (17:03 +0100)
xbmc/addons/Scraper.cpp

index a86fda7..a2d283a 100644 (file)
@@ -356,14 +356,23 @@ bool CScraper::Load()
         continue;
       }  
       AddonPtr dep;
-      if (!CAddonMgr::Get().GetAddon((*itr).first, dep))
+
+      bool bOptional = itr->second.second;
+
+      if (CAddonMgr::Get().GetAddon((*itr).first, dep))
       {
-        result = false;
-        break;
+        TiXmlDocument doc;
+        if (dep->Type() == ADDON_SCRAPER_LIBRARY && doc.LoadFile(dep->LibPath()))
+          m_parser.AddDocument(&doc);
+      }
+      else
+      {
+        if (!bOptional)
+        {
+          result = false;
+          break;
+        }
       }
-      TiXmlDocument doc;
-      if (dep->Type() == ADDON_SCRAPER_LIBRARY && doc.LoadFile(dep->LibPath()))
-        m_parser.AddDocument(&doc);
       itr++;
     }
   }