From dc7a288539a99eb88a24b28f6bd675604331f04c Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Thu, 27 Oct 2016 17:34:41 +0800 Subject: [PATCH] Make trigger_dialog_handler return window_event_result::close instead of closing itself This ensures the event system will know what's going on. --- similar/editor/eswitch.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/similar/editor/eswitch.cpp b/similar/editor/eswitch.cpp index a6cdae77f..b7d50851b 100644 --- a/similar/editor/eswitch.cpp +++ b/similar/editor/eswitch.cpp @@ -365,8 +365,7 @@ window_event_result trigger_dialog_handler(UI_DIALOG *dlg,const d_event &event, Assert(MainWindow != NULL); if (!Markedsegp) { - close_trigger_window(); - return window_event_result::ignored; + return window_event_result::close; } //------------------------------------------------------------ @@ -477,8 +476,7 @@ window_event_result trigger_dialog_handler(UI_DIALOG *dlg,const d_event &event, Update_flags |= UF_WORLD_CHANGED; if (GADGET_PRESSED(t->quitButton.get()) || keypress == KEY_ESC) { - close_trigger_window(); - return window_event_result::handled; + return window_event_result::close; } t->old_trigger_num = trigger_num;