From 8a06263ba6f401f799655de7b63c929ed8733066 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 4 Oct 2019 17:41:03 +0200
Subject: [PATCH] Fix regression with 'Set Core Association' and leave a
 TODO/FIXME note

---
 menu/cbs/menu_cbs_ok.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 1a235cbc8b..233bf7ca56 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -4197,8 +4197,10 @@ static int action_ok_set_core_association(const char *path,
    if (!menu)
       return menu_cbs_exit();
 
+   /* TODO/FIXME - menu->rpl_entry_selection_ptr - find
+    * a way so that we can remove this temporary state */
    return generic_action_ok_displaylist_push(path, NULL,
-         NULL, 0, idx, entry_idx,
+         NULL, 0, menu->rpl_entry_selection_ptr, entry_idx,
          ACTION_OK_DL_DEFERRED_CORE_LIST_SET);
 }