Merge pull request #4645 from jmarshallnz/install_from_zip_not_packages
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 16 May 2014 21:15:57 +0000 (09:15 +1200)
committerTrent Nelson <trent.nelson@pivosgroup.com>
Sat, 7 Jun 2014 05:27:38 +0000 (13:27 +0800)
[addons] install from zip should install from the zip, not from packages

xbmc/addons/AddonInstaller.cpp

index c100089..4598615 100644 (file)
@@ -289,7 +289,7 @@ bool CAddonInstaller::InstallFromZip(const CStdString &path)
   if (xml.LoadFile(archive) && CAddonMgr::Get().LoadAddonDescriptionFromMemory(xml.RootElement(), addon))
   {
     // set the correct path
-    addon->Props().path = path;
+    addon->Props().path = items[0]->GetPath();
 
     // install the addon
     return DoInstall(addon);