From 34414b59193a9b6db228ae8ea6cf38b04a613752 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 9 Jul 2015 22:16:27 +0200 Subject: [PATCH] Menu toggle should be properly saved now with custom bind - the forced hack broke all sorts of behavior --- frontend/drivers/platform_android.c | 2 ++ input/drivers_joypad/android_joypad.c | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c index 57a53ca92c..7301ef8d06 100644 --- a/frontend/drivers/platform_android.c +++ b/frontend/drivers/platform_android.c @@ -757,10 +757,12 @@ static void frontend_android_get_environment_settings(int *argc, else if (!strcmp(device_model, "JSS15J")) g_defaults.settings.video_refresh_rate = 59.65; +#if 0 /* Explicitly disable input overlay by default * for gamepad-like/console devices. */ if (device_is_game_console(device_model)) g_defaults.settings.input_overlay_enable = false; +#endif } static void frontend_android_deinit(void *data) diff --git a/input/drivers_joypad/android_joypad.c b/input/drivers_joypad/android_joypad.c index 68203c9467..818dec8dbd 100644 --- a/input/drivers_joypad/android_joypad.c +++ b/input/drivers_joypad/android_joypad.c @@ -24,15 +24,8 @@ static const char *android_joypad_name(unsigned pad) static bool android_joypad_init(void *data) { - unsigned autoconf_pad; - settings_t *settings = config_get_ptr(); + engine_handle_dpad = engine_handle_dpad_default; - (void)data; - - for (autoconf_pad = 0; autoconf_pad < MAX_USERS; autoconf_pad++) - settings->input.binds[autoconf_pad][RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK; - - engine_handle_dpad = engine_handle_dpad_default; if ((dlopen("/system/lib/libandroid.so", RTLD_LOCAL | RTLD_LAZY)) == 0) { RARCH_WARN("Unable to open libandroid.so\n"); @@ -53,7 +46,7 @@ static bool android_joypad_button(unsigned port, uint16_t joykey) { uint8_t *buf = NULL; driver_t *driver = driver_get_ptr(); - android_input_t *android = (android_input_t*)driver->input_data; + android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL; if (!android || port >= MAX_PADS) return false; @@ -91,7 +84,7 @@ static int16_t android_joypad_axis(unsigned port, uint32_t joyaxis) bool is_neg = false; bool is_pos = false; driver_t *driver = driver_get_ptr(); - android_input_t *android = (android_input_t*)driver->input_data; + android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL; if (!android || joyaxis == AXIS_NONE || port >= MAX_PADS) return 0; @@ -124,7 +117,7 @@ static void android_joypad_poll(void) static bool android_joypad_query_pad(unsigned pad) { driver_t *driver = driver_get_ptr(); - android_input_t *android = (android_input_t*)driver->input_data; + android_input_t *android = driver ? (android_input_t*)driver->input_data : NULL; return (pad < MAX_USERS && pad < android->pads_connected); }