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

Make trigger_dialog_handler return window_event_result::close instead of closing itself

Browse source 
This ensures the event system will know what's going on.
This commit is contained in:
Chris Taylor 2016-10-27 17:34:41 +08:00
parent 9d7b7dc160
commit dc7a288539
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/editor/eswitch.cpp
View file

@ -365,8 +365,7 @@ window_event_result trigger_dialog_handler(UI_DIALOG *dlg,const d_event &event,
Assert(MainWindow != NULL); Assert(MainWindow != NULL);
if (!Markedsegp) { if (!Markedsegp) {
close_trigger_window(); return window_event_result::close;
return window_event_result::ignored;
} }
//------------------------------------------------------------ //------------------------------------------------------------
@ -477,8 +476,7 @@ window_event_result trigger_dialog_handler(UI_DIALOG *dlg,const d_event &event,
Update_flags |= UF_WORLD_CHANGED; Update_flags |= UF_WORLD_CHANGED;
if (GADGET_PRESSED(t->quitButton.get()) || keypress == KEY_ESC) if (GADGET_PRESSED(t->quitButton.get()) || keypress == KEY_ESC)
{ {
close_trigger_window(); return window_event_result::close;
return window_event_result::handled;
} }
t->old_trigger_num = trigger_num; t->old_trigger_num = trigger_num;