From 53cd92727ec7569b1ecc334752645e017a5fb105 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Mon, 28 Jun 2021 03:37:49 +0000
Subject: [PATCH] Move marker_delete_are_you_sure_menu select handling to
 event_handler

---
 similar/main/automap.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/similar/main/automap.cpp b/similar/main/automap.cpp
index ac2ebf940..9d443a5b5 100644
--- a/similar/main/automap.cpp
+++ b/similar/main/automap.cpp
@@ -287,11 +287,12 @@ struct marker_delete_are_you_sure_menu : std::array<newmenu_item, 2>, newmenu
 	{
 	}
 	virtual int subfunction_handler(const d_event &) override;
+	virtual window_event_result event_handler(const d_event &) override;
 	static std::pair<imobjidx_t *, game_marker_index> get_marker_object(d_marker_state &MarkerState);
 	void handle_selected_yes() const;
 };
 
-int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
+window_event_result marker_delete_are_you_sure_menu::event_handler(const d_event &event)
 {
 	switch (event.type)
 	{
@@ -303,11 +304,16 @@ int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
 				handle_selected_yes();
 			/* The dialog should close after the user picks Yes or No.
 			 */
-			return 0;
+			return window_event_result::close;
 		}
 		default:
-			break;
+			return newmenu::event_handler(event);
 	}
+}
+
+int marker_delete_are_you_sure_menu::subfunction_handler(const d_event &event)
+{
+	(void)event;
 	return 0;
 }