From 8a3cd4c614374867729957a0d2dda166a464eed6 Mon Sep 17 00:00:00 2001 From: Kp Date: Mon, 28 Jun 2021 03:37:49 +0000 Subject: [PATCH] Move joystick configuration menu subfunction handling to event_handler --- similar/main/menu.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index 5ad0f98e0..c6d810ea6 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -1600,9 +1600,16 @@ struct menu : menu_items, newmenu { } virtual int subfunction_handler(const d_event &event) override; + virtual window_event_result event_handler(const d_event &event) override; }; int menu::subfunction_handler(const d_event &event) +{ + (void)event; + return 0; +} + +window_event_result menu::event_handler(const d_event &event) { switch (event.type) { @@ -1617,7 +1624,7 @@ int menu::subfunction_handler(const d_event &event) default: break; } - return 0; + return newmenu::event_handler(event); } }