fixed: Addons weren't installed correctly

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@30415 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
opdenkamp · May 22, 2010 · 92afa2e · 92afa2e
1 parent cd2be2f
commit 92afa2e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/xbmc/GUIWindowAddonBrowser.cpp b/xbmc/GUIWindowAddonBrowser.cpp
@@ -306,7 +306,7 @@ void CGUIWindowAddonBrowser::OnJobComplete(unsigned int jobID,
                                                CUtil::GetFileName(strFolder));
           }
           AddonPtr addon;
-          if (CAddonMgr::AddonFromInfoXML(strFolder,addon))
+          if (CAddonMgr::Get().CPAddonFromInfoXML(strFolder, addon))
           {
             CStdString strFolder2;
             CUtil::GetDirectory(strFolder,strFolder2);

diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
@@ -1017,6 +1017,19 @@ CStdString CAddonMgr::GetExtValue(cp_cfg_element_t *base, const char *path)
   else return CStdString();
 }
 
+bool CAddonMgr::CPAddonFromInfoXML(const CStdString &path, AddonPtr &addon)
+{
+  cp_status_t status;
+  cp_plugin_info_t *info = m_cpluff->load_plugin_descriptor(m_cp_context, _P(path).c_str(), &status);
+  if (info)
+  {
+    addon = Factory(info->extensions);
+    m_cpluff->release_info(m_cp_context, info);
+    return addon.get();
+  }
+  return false;
+}
+
 bool CAddonMgr::AddonsFromInfoXML(const TiXmlElement *root, VECADDONS &addons)
 {
   // create a context for these addons

diff --git a/xbmc/addons/AddonManager.h b/xbmc/addons/AddonManager.h
@@ -105,6 +105,7 @@ namespace ADDON
     /* libcpluff */
     CStdString GetExtValue(cp_cfg_element_t *base, const char *path);
     const cp_extension_t *GetExtension(const cp_plugin_info_t *props, const char *extension);
+    bool CPAddonFromInfoXML(const CStdString &path, AddonPtr &addon);
     bool AddonsFromInfoXML(const TiXmlElement *root, VECADDONS &addons);
 
   private: