From 2a0dba30097be6811c2590c86f578caf045f90e3 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 27 Oct 2016 06:53:06 +0200 Subject: [PATCH] Move all_users_control_menu code to input/input_driver.c --- input/input_driver.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 7b4af2c3ea..83385f53b9 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -702,9 +702,19 @@ uint64_t input_menu_keys_pressed(void) #endif ) { + int port; + int port_max = 1; #if 1 - state = input_joypad_pressed(input_driver_get_joypad_driver(), - 0, settings->input.binds[0], i); + if (settings->input.all_users_control_menu) + port_max = settings->input.max_users; + + for (port = 0; port < port_max; port++) + { + state = input_joypad_pressed(input_driver_get_joypad_driver(), + port, settings->input.binds[0], i); + if (state) + break; + } #else state = current_input->key_pressed(current_input_data, i); #endif