mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 01:24:18 +00:00
Fix skindownload by only allowing move assignments
This commit is contained in:
parent
7dc0c980b5
commit
edc79e48cc
|
@ -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));
|
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);
|
Skin.m_pTask = std::make_shared<CGetPngFile>(this, aUrl, Storage(), Skin.m_aPath);
|
||||||
m_pClient->Engine()->AddJob(Skin.m_pTask);
|
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;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,6 +29,9 @@ public:
|
||||||
char m_aPath[IO_MAX_PATH_LENGTH];
|
char m_aPath[IO_MAX_PATH_LENGTH];
|
||||||
char m_aName[24];
|
char m_aName[24];
|
||||||
|
|
||||||
|
CDownloadSkin(CDownloadSkin &&Other) = default;
|
||||||
|
CDownloadSkin() = default;
|
||||||
|
|
||||||
~CDownloadSkin()
|
~CDownloadSkin()
|
||||||
{
|
{
|
||||||
if(m_pTask)
|
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 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) < 0; }
|
||||||
bool operator==(const char *pOther) const { return !str_comp(m_aName, pOther); }
|
bool operator==(const char *pOther) const { return !str_comp(m_aName, pOther); }
|
||||||
|
|
||||||
|
CDownloadSkin &operator=(CDownloadSkin &&Other) = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef std::function<void(int)> TSkinLoadedCBFunc;
|
typedef std::function<void(int)> TSkinLoadedCBFunc;
|
||||||
|
|
Loading…
Reference in a new issue