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

Make wall_dialog_handler return window_event_result::close instead of closing itself

Browse source 
This ensures the event system will know what's going on. Also remove the 'likely' branch prediction macro from close_wall_window because close_wall_window will only be called outside of the wall dialog's handler (to open a different dialog or close the editor).
This commit is contained in:
Chris Taylor 2016-10-27 18:07:57 +08:00
parent fd3e60be54
commit bd3078b672
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
similar/editor/medwall.cpp
View file

@ -378,7 +378,7 @@ static window_event_result wall_dialog_created(UI_DIALOG *const w, wall_dialog *
void close_wall_window()
{
if (likely(MainWindow))
if (MainWindow)
ui_close_dialog(exchange(MainWindow, nullptr));
}
@ -574,8 +574,7 @@ window_event_result wall_dialog_handler(UI_DIALOG *dlg,const d_event &event, wal
Update_flags |= UF_WORLD_CHANGED;
if (GADGET_PRESSED(wd->quitButton.get()) || keypress == KEY_ESC)
{
close_wall_window();
return window_event_result::handled;
return window_event_result::close;
}
wd->old_wall_num = Cursegp->sides[Curside].wall_num;