ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure icon handling of addons is thread safe

Browse Source
This commit is contained in:
Benau 2019-12-20 09:55:12 +08:00
parent dce9bf1e63
commit fe0cb90769
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/addons/addons_manager.cpp
View File

@ -290,10 +290,9 @@ void AddonsManager::initAddons(const XMLNode *xml)
} }
m_addons_list.unlock(); m_addons_list.unlock();
m_state.setAtomic(STATE_READY);
if (UserConfigParams::m_internet_status == RequestManager::IPERM_ALLOWED) if (UserConfigParams::m_internet_status == RequestManager::IPERM_ALLOWED)
downloadIcons(); downloadIcons();
m_state.setAtomic(STATE_READY);
} // initAddons } // initAddons
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -391,12 +390,9 @@ void AddonsManager::downloadIcons()
class IconRequest : public Online::HTTPRequest class IconRequest : public Online::HTTPRequest
{ {
Addon *m_addon; // stores this addon object Addon *m_addon; // stores this addon object
void afterOperation()
{
m_addon->setIconReady();
} // afterOperation
void callback() void callback()
{ {
m_addon->setIconReady();
if (!hadDownloadError()) if (!hadDownloadError())
addons_manager->m_downloaded_icons = true; addons_manager->m_downloaded_icons = true;
} // callback } // callback