edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1959 from heinrich5991/pr_fix_themecrash

Browse source 
Fix `str_truncate` call in theme scan
This commit is contained in:
oy 2019-01-07 19:49:40 +01:00 committed by GitHub
parent 745bbf580e 2137a39f93
commit efc844e668
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/components/menus_settings.cpp
View file

@ -593,12 +593,12 @@ int CMenus::ThemeScan(const char *pName, int IsDir, int DirType, void *pUser)
bool IsNight = false;
if((pSuffix = str_endswith(aFullName, "_day")))
{
str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aThemeName);
str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aFullName);
IsDay = true;
}
else if((pSuffix = str_endswith(aFullName, "_night")))
{
str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aThemeName);
str_truncate(aThemeName, sizeof(aThemeName), pName, pSuffix - aFullName);
IsNight = true;
}
else