diff options
author | Pär Björklund <per.bjorklund@gmail.com> | 2015-09-12 21:46:34 +0200 |
---|---|---|
committer | Pär Björklund <per.bjorklund@gmail.com> | 2015-09-12 21:46:34 +0200 |
commit | 0b044042325aeccb896cd780fbf33f844144e29d (patch) | |
tree | 48593c59adb255b85b2237bb17badca4addd2301 | |
parent | cb910ed16d4300eb9ecf43e57c9e067e9a5be5d3 (diff) | |
parent | 4b9cde78f7b41e98ed1ccf990780a0b11bcaa0fb (diff) |
Merge pull request #8025 from Paxxi/fix_indent
[xbmc] Fix formatting I messed up
-rw-r--r-- | xbmc/addons/Repository.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/xbmc/addons/Repository.cpp b/xbmc/addons/Repository.cpp index 8e4b10f733..ada3364d3c 100644 --- a/xbmc/addons/Repository.cpp +++ b/xbmc/addons/Repository.cpp @@ -253,12 +253,12 @@ bool CRepositoryUpdateJob::DoWork() //unnecessary HEAD requests being sent to server. icons and fanart rarely //change, and cannot change if there is no version bump. { - CTextureDatabase textureDB; - textureDB.Open(); - textureDB.BeginMultipleExecute(); + CTextureDatabase textureDB; + textureDB.Open(); + textureDB.BeginMultipleExecute(); for (const auto& addon : addons) - { + { if (!addon->Props().fanart.empty()) textureDB.InvalidateCachedTexture(addon->Props().fanart); if (!addon->Props().icon.empty()) @@ -311,8 +311,8 @@ bool CRepositoryUpdateJob::DoWork() //Unbroken CLog::Log(LOGDEBUG, "CRepositoryUpdateJob[%s] addon '%s' unbroken", m_repo->ID().c_str(), addon->ID().c_str()); + } } - } //Update broken status database.BreakAddon(addon->ID(), addon->Props().broken); @@ -349,21 +349,22 @@ CRepositoryUpdateJob::FetchStatus CRepositoryUpdateJob::FetchIfChanged(const std if (oldChecksum == checksum && !oldChecksum.empty()) return STATUS_NOT_MODIFIED; - std::map<std::string, AddonPtr> uniqueAddons; + std::map<std::string, AddonPtr> uniqueAddons; for (auto it = m_repo->m_dirs.cbegin(); it != m_repo->m_dirs.cend(); ++it) - { + { if (ShouldCancel(m_repo->m_dirs.size() + std::distance(m_repo->m_dirs.cbegin(), it), total)) return STATUS_ERROR; - VECADDONS addons; - if (!CRepository::Parse(*it, addons)) + VECADDONS addons; + if (!CRepository::Parse(*it, addons)) { CLog::Log(LOGERROR, "CRepositoryUpdateJob[%s] failed to read or parse " "directory '%s'", m_repo->ID().c_str(), it->info.c_str()); return STATUS_ERROR; - } - MergeAddons(uniqueAddons, addons); } + MergeAddons(uniqueAddons, addons); + } + for (const auto& kv : uniqueAddons) addons.push_back(kv.second); |