From 7c2bd73dfd4dde29e12af2d879c481b06daa0aed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Thu, 25 Sep 2014 23:04:34 +0200 Subject: [PATCH] (Lakka) Remember settings active submenu --- frontend/menu/backend/menu_lakka_backend.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index d7bcb770f4..fbbcd0209f 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -190,6 +190,18 @@ static void lakka_reset_submenu(int i, int j) } } +static bool lakka_on_active_rom(void) +{ + menu_category_t *active_category = (menu_category_t*) + &categories[menu_active_category]; + + return !(g_extern.main_is_init + && !g_extern.libretro_dummy + && (!strcmp(g_extern.fullpath, + active_category->items[ + active_category->active_item].rom))); +} + static void lakka_open_submenu(void) { int i, j, k; @@ -201,14 +213,7 @@ static void lakka_open_submenu(void) menu_category_t *active_category = (menu_category_t*) &categories[menu_active_category]; - bool do_reset = !( - g_extern.main_is_init - && !g_extern.libretro_dummy - && (!strcmp(g_extern.fullpath, - active_category->items[ - active_category->active_item].rom))); - - if (do_reset) + if (menu_active_category > 0 && lakka_on_active_rom()) lakka_reset_submenu(menu_active_category, active_category->active_item); for (i = 0; i < num_categories; i++)