TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix crash caused by last commit (whoops)

Browse source
This commit is contained in:
kreatordxx 2010-07-25 02:43:22 +00:00
parent 961fd2b1b8
commit c7da78f144
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.txt
View file

@ -5,6 +5,7 @@ D2X-Rebirth Changelog
arch/sdl/event.c, arch/ogl/gr.c, arch/sdl/gr.c: Exit SDL_PollEvent early if window changes, to avoid menu problems when pressing keys fast; fix 'condition is always false' warning
main/inferno.c, main/inferno.h, main/movie.c: Rewrite quit system, fixing *many* bugs with it :P
main/newmenu: For menus, only call the user function for closing immediately before closing, fixing memory errors when the user function frees memory
main/newmenu.c: Fix crash caused by last commit (whoops)
20100721
--------

3
main/newmenu.c
View file

@ -1538,7 +1538,8 @@ int newmenu_handler(window *wind, d_event *event, newmenu *menu)
if (window_exists(wind))
{
(*menu->subfunction)(menu, event, menu->userdata); // can't cancel here - too hard
if (menu->subfunction)
(*menu->subfunction)(menu, event, menu->userdata); // can't cancel here - too hard
d_free(menu);
}
break;