zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-10 23:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Braden Obrzut 2013-07-29 18:55:29 -04:00
commit bc71d4537e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/menu/loadsavemenu.cpp
View file

@ -131,7 +131,8 @@ void ClearSaveGames()
{ {
for(unsigned i=0;i<DLoadSaveMenu::SaveGames.Size(); i++) for(unsigned i=0;i<DLoadSaveMenu::SaveGames.Size(); i++)
{ {
delete DLoadSaveMenu::SaveGames[i]; if(!DLoadSaveMenu::SaveGames[i]->bNoDelete)
delete DLoadSaveMenu::SaveGames[i];
} }
DLoadSaveMenu::SaveGames.Clear(); DLoadSaveMenu::SaveGames.Clear();
} }

2
src/sdl/i_system.cpp
View file

@ -749,6 +749,8 @@ int I_FindClose (void *handle)
findstate_t *state = (findstate_t *)handle; findstate_t *state = (findstate_t *)handle;
if (handle != (void*)-1 && state->count > 0) if (handle != (void*)-1 && state->count > 0)
{ {
for(int i = 0;i < state->count;++i)
free (state->namelist[i]);
state->count = 0; state->count = 0;
free (state->namelist); free (state->namelist);
state->namelist = NULL; state->namelist = NULL;