edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix skindownload by only allowing move assignments

Browse source
This commit is contained in:
Jupeyy 2022-07-04 18:24:34 +02:00
parent 7dc0c980b5
commit edc79e48cc
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/client/components/skins.cpp
View file

@ -450,6 +450,6 @@ int CSkins::FindImpl(const char *pName)
str_format(Skin.m_aPath, sizeof(Skin.m_aPath), "downloadedskins/%s", IStorage::FormatTmpPath(aBuf, sizeof(aBuf), pName));
Skin.m_pTask = std::make_shared<CGetPngFile>(this, aUrl, Storage(), Skin.m_aPath);
m_pClient->Engine()->AddJob(Skin.m_pTask);
m_vDownloadSkins.insert(std::lower_bound(m_vDownloadSkins.begin(), m_vDownloadSkins.end(), Skin), Skin);
m_vDownloadSkins.insert(std::lower_bound(m_vDownloadSkins.begin(), m_vDownloadSkins.end(), Skin), std::move(Skin));
return -1;
}

5
src/game/client/components/skins.h
View file

@ -29,6 +29,9 @@ public:
char m_aPath[IO_MAX_PATH_LENGTH];
char m_aName[24];
CDownloadSkin(CDownloadSkin &&Other) = default;
CDownloadSkin() = default;
~CDownloadSkin()
{
if(m_pTask)
@ -37,6 +40,8 @@ public:
bool operator<(const CDownloadSkin &Other) const { return str_comp(m_aName, Other.m_aName) < 0; }
bool operator<(const char *pOther) const { return str_comp(m_aName, pOther) < 0; }
bool operator==(const char *pOther) const { return !str_comp(m_aName, pOther); }
CDownloadSkin &operator=(CDownloadSkin &&Other) = default;
};
typedef std::function<void(int)> TSkinLoadedCBFunc;