From 9bdb6291b06de96a4bf754b1e36c3b01637af65e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 18 Feb 2018 00:49:26 +0100 Subject: [PATCH] (input device ID) Should no longer crash when pressing left on this entry when no devices are connected --- menu/menu_setting.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index aefbbbb9b6..ee90a6fd43 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -1319,13 +1319,13 @@ static int setting_action_right_libretro_device_type( static int setting_action_left_bind_device(void *data, bool wraparound) { - unsigned index_offset; unsigned *p = NULL; - unsigned max_devices = input_config_get_device_count(); + unsigned index_offset = 0; + unsigned max_devices = input_config_get_device_count(); rarch_setting_t *setting = (rarch_setting_t*)data; settings_t *settings = config_get_ptr(); - if (!setting) + if (!setting || max_devices == 0) return -1; index_offset = setting->index_offset;