From 30dea5e4ff469c44173be052eb271dea531237db Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 27 Jan 2015 18:47:57 +0100
Subject: [PATCH] Fix regular custom binds

---
 menu/menu_entries_cbs.c | 7 +++++--
 settings_data.c         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 612cad8efd..189eaf733e 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -3227,8 +3227,11 @@ static int action_iterate_main(const char *label, unsigned action)
          !strcmp(label, "rdb_entry_detail")
          )
       return action_iterate_rdb_entry_detail(label, path_offset, label_offset, action);
-   else if (!strcmp(label, "custom_bind_all") ||
-         !strcmp(label, "custom_bind_defaults"))
+   else if (
+         !strcmp(label, "custom_bind") ||
+         !strcmp(label, "custom_bind_all") ||
+         !strcmp(label, "custom_bind_defaults")
+         )
    {
       if (g_extern.menu.bind_mode_keyboard)
          return action_iterate_custom_bind_keyboard(label, action);
diff --git a/settings_data.c b/settings_data.c
index 5ec1f16c2d..ab51d32b60 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -1090,7 +1090,7 @@ static int setting_data_bind_action_ok(void *data, unsigned action)
    menu_list_push_stack(
          driver.menu->menu_list,
          "",
-         "",
+         "custom_bind",
          g_extern.menu.bind_mode_keyboard ?
          MENU_SETTINGS_CUSTOM_BIND_KEYBOARD : MENU_SETTINGS_CUSTOM_BIND,
          driver.menu->selection_ptr);