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

Remove use of window_exists in newmenu_handler

Browse source 
Replace with a disabled check for window_event_result::deleted, which will be enabled when all newmenu subfunctions return a window_event_result. There are currently no instances of a subfunction closing the window itself (which is preferred).
This commit is contained in:
Chris Taylor 2016-10-28 08:22:36 +08:00
parent 7b83123010
commit c351588bba
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/newmenu.cpp
View file

@ -1512,8 +1512,11 @@ static window_event_result newmenu_handler(window *wind,const d_event &event, ne
{
int rval = (*menu->subfunction)(menu, event, menu->userdata);
if (!window_exists(wind))
return window_event_result::handled; // some subfunction closed the window: bail!
#if 0 // No current instances of the subfunction closing the window itself (which is preferred)
// Enable when all subfunctions return a window_event_result
if (rval == window_event_result::deleted)
return rval; // some subfunction closed the window: bail!
#endif
if (rval)
{