aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2015-12-13 12:46:22 +0100
committerMartijn Kaijser <martijn@xbmc.org>2015-12-13 12:46:22 +0100
commita724f299675c56efba8337f6215a1f95a217c238 (patch)
tree7f0838d4a57cfcb30ce6e6616a1b771ff5177263
parent9e229a3639fda46523b64c503512a07b02c9d486 (diff)
parent065f8e63a8ee639c974f737f35425e700219dd48 (diff)
Merge pull request #8580 from MartijnKaijser/fix_addon_download_path16.0b4-Jarvis
[addons] fix download location for multi directory repositories
-rw-r--r--xbmc/addons/Repository.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp
index 2bcb414cf4..1a4be8ee64 100644
--- a/xbmc/addons/Repository.cpp
+++ b/xbmc/addons/Repository.cpp
@@ -366,12 +366,14 @@ CRepositoryUpdateJob::FetchStatus CRepositoryUpdateJob::FetchIfChanged(const std
if (ShouldCancel(m_repo->m_dirs.size() + std::distance(m_repo->m_dirs.cbegin(), it), total))
return STATUS_ERROR;
- if (!CRepository::Parse(*it, addons))
+ VECADDONS tmp;
+ if (!CRepository::Parse(*it, tmp))
{
CLog::Log(LOGERROR, "CRepositoryUpdateJob[%s] failed to read or parse "
"directory '%s'", m_repo->ID().c_str(), it->info.c_str());
return STATUS_ERROR;
}
+ addons.insert(addons.end(), tmp.begin(), tmp.end());
}
SetProgress(total, total);