From 59c3f8b06e559798cb5e13ab7cd9c80a9cf120aa Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 7 Jun 2017 01:19:44 +0200 Subject: [PATCH] Cleanups --- input/drivers/linuxraw_input.c | 4 ++-- input/drivers/x11_input.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index 3377dd7b02..13f8353fd9 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -81,11 +81,11 @@ static int16_t linuxraw_analog_pressed(linuxraw_input_t *linuxraw, input_conv_analog_id_to_bind_id(idx, id, &id_minus, &id_plus); - if ((id_minus < RARCH_BIND_LIST_END) && binds && binds->valid && + if ((id_minus < RARCH_BIND_LIST_END) && binds->valid && linuxraw->state[rarch_keysym_lut[(enum retro_key)binds[id_minus].key]] ) pressed_minus = -0x7fff; - if ((id_plus < RARCH_BIND_LIST_END) && binds && binds->valid && + if ((id_plus < RARCH_BIND_LIST_END) && binds->valid && linuxraw->state[rarch_keysym_lut[(enum retro_key)binds[id_plus].key]] ) pressed_plus = 0x7fff; diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index ce3b723d8d..4945333a11 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -92,14 +92,14 @@ static int16_t x_pressed_analog(x11_input_t *x11, sym = rarch_keysym_lut[(enum retro_key)id_minus_key]; keycode = XKeysymToKeycode(x11->display, sym); - if (binds && binds[id_minus].valid + if ( binds[id_minus].valid && (id_minus_key < RETROK_LAST) && (x11->state[keycode >> 3] & (1 << (keycode & 7)))) pressed_minus = -0x7fff; sym = rarch_keysym_lut[(enum retro_key)id_plus_key]; keycode = XKeysymToKeycode(x11->display, sym); - if (binds && binds[id_plus].valid + if ( binds[id_plus].valid && (id_plus_key < RETROK_LAST) && (x11->state[keycode >> 3] & (1 << (keycode & 7)))) pressed_plus = 0x7fff;