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

Merge #2895

Browse source 
2895: Reload skin menu when skin count changed r=Jupeyy a=def-

fixes graphics bug when new skins are added, skins array is reallocated and we accessed freed memory

Thanks to Jupeyy & Learath2 for also looking into this

Screenshot of the bug for reference, reproduced by removing all skins in data/skins, opening skin menu, joining a full server and waiting a bit:
![screenshot-20200921@005129](https://user-images.githubusercontent.com/2335377/93745612-1cae5300-fbf4-11ea-8b9f-887f0f46f7a6.png)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-09-21 17:43:08 +00:00 committed by GitHub
parent b3307dc2a6 3276f2925d
commit adf4103bd3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -555,8 +555,9 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
MainView.HSplitTop(20.0f, 0, &MainView);
MainView.HSplitTop(230.0f, &SkinList, &MainView);
static sorted_array<const CSkins::CSkin *> s_paSkinList;
static int s_SkinCount = 0;
static float s_ScrollValue = 0.0f;
if(s_InitSkinlist)
if(s_InitSkinlist || m_pClient->m_pSkins->Num() != s_SkinCount)
{
s_paSkinList.clear();
for(int i = 0; i < m_pClient->m_pSkins->Num(); ++i)
@ -575,9 +576,10 @@ void CMenus::RenderSettingsTee(CUIRect MainView)
if (g_Config.m_ClVanillaSkinsOnly && !s->m_IsVanilla)
continue;
s_paSkinList.add(s);
s_paSkinList.add_unsorted(s);
}
s_InitSkinlist = false;
s_SkinCount = m_pClient->m_pSkins->Num();
}
int OldSelected = -1;