CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-18 00:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove action_cancel_lookup_setting

Browse Source
This commit is contained in:
twinaphex 2015-05-18 02:59:37 +02:00
parent 3fcb3fe638
commit 1e17ecdce1
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
menu/menu_entries_cbs_cancel.c
View File

@ -19,12 +19,6 @@
#include "menu_entry.h"
#include "menu_setting.h"
static int action_cancel_lookup_setting(const char *path,
const char *label, unsigned type, size_t idx)
{
return menu_setting_set(type, label, MENU_ACTION_CANCEL, false);
}
static int action_cancel_pop_default(const char *path,
const char *label, unsigned type, size_t idx)
{
@ -38,8 +32,5 @@ void menu_entries_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
if (!cbs)
return;
cbs->action_cancel = action_cancel_lookup_setting;
/* TODO - add some stuff here. */
cbs->action_cancel = action_cancel_pop_default;
}

3
menu/menu_input.c
View File

@ -522,11 +522,10 @@ int menu_input_bind_iterate_keyboard(void)
if (timeout <= 0)
{
menu->binds.begin++;
/* Could be unsafe, but whatever. */
menu->binds.target->key = RETROK_UNKNOWN;
menu->binds.begin++;
menu->binds.target++;
menu->binds.timeout_end = rarch_get_time_usec() +
MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;