mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 22:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flush RGUI menu stack correctly.

Browse Source 
Menu stack wasn't flushed out correctly on ROM load.
This commit is contained in:
Themaister 2013-05-04 16:56:02 +02:00
parent a5f89d88ce
commit 254d9b36d6
1 changed files with 16 additions and 19 deletions

35
frontend/menu/rgui.c

@ -161,6 +161,18 @@ static void init_font(rgui_handle_t *rgui, const uint8_t *font_bmp_buf)
rgui->font = font; rgui->font = font;
} }
static void rgui_flush_menu_stack(rgui_handle_t *rgui)
{
rgui->need_refresh = true;
unsigned type = 0;
rgui_list_get_last(rgui->menu_stack, NULL, &type);
while (type != RGUI_SETTINGS)
{
rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr);
rgui_list_get_last(rgui->menu_stack, NULL, &type);
}
}
static bool menu_type_is_settings(unsigned type) static bool menu_type_is_settings(unsigned type)
{ {
return type == RGUI_SETTINGS || return type == RGUI_SETTINGS ||
@ -2224,14 +2236,7 @@ int rgui_iterate(rgui_handle_t *rgui)
ret = -1; ret = -1;
#endif #endif
rgui->need_refresh = true; rgui_flush_menu_stack(rgui);
unsigned type = 0;
rgui_list_get_last(rgui->menu_stack, NULL, &type);
while (type != RGUI_SETTINGS)
{
rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr);
rgui_list_get_last(rgui->menu_stack, NULL, &type);
}
} }
else if (menu_type == RGUI_SETTINGS_DISK_APPEND) else if (menu_type == RGUI_SETTINGS_DISK_APPEND)
{ {
@ -2241,21 +2246,13 @@ int rgui_iterate(rgui_handle_t *rgui)
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME; g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
rgui->need_refresh = true; rgui_flush_menu_stack(rgui);
unsigned type = 0;
rgui_list_get_last(rgui->menu_stack, NULL, &type);
while (type != RGUI_SETTINGS)
{
rgui_list_pop(rgui->menu_stack, &rgui->selection_ptr);
rgui_list_get_last(rgui->menu_stack, NULL, &type);
}
ret = -1; ret = -1;
} }
else if (menu_type == RGUI_SETTINGS_OPEN_HISTORY) else if (menu_type == RGUI_SETTINGS_OPEN_HISTORY)
{ {
load_menu_game_history(rgui->selection_ptr); load_menu_game_history(rgui->selection_ptr);
rgui->need_refresh = true; rgui_flush_menu_stack(rgui);
ret = -1; ret = -1;
} }
else else
@ -2263,7 +2260,7 @@ int rgui_iterate(rgui_handle_t *rgui)
fill_pathname_join(g_extern.fullpath, dir, path, sizeof(g_extern.fullpath)); fill_pathname_join(g_extern.fullpath, dir, path, sizeof(g_extern.fullpath));
g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_LOAD_GAME);
rgui->need_refresh = true; // in case of zip extract rgui_flush_menu_stack(rgui);
rgui->msg_force = true; rgui->msg_force = true;
ret = -1; ret = -1;
} }