From: jmarshallnz <jcmarsha@gmail.com>
Date: Fri, 16 May 2014 21:15:57 +0000 (+1200)
Subject: Merge pull request #4645 from jmarshallnz/install_from_zip_not_packages
X-Git-Tag: 13.2b1-Gotham~32^2~25
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_xbmc;a=commitdiff_plain;h=bb8300ea9c6c641bff34e491a628df269f401790

Merge pull request #4645 from jmarshallnz/install_from_zip_not_packages

[addons] install from zip should install from the zip, not from packages
---

diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
index c100089..4598615 100644
--- a/xbmc/addons/AddonInstaller.cpp
+++ b/xbmc/addons/AddonInstaller.cpp
@@ -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);