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

Avoid global info_selection_ptr.

Browse Source 
Don't reset selection_ptr after info screen.
This commit is contained in:
Themaister 2014-05-31 14:52:27 +02:00
parent 768e23ef4d
commit 53661c5dea
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/backend/menu_common_backend.c
View File

@ -43,8 +43,6 @@
#endif
#endif
static unsigned info_selection_ptr = 0;
#ifdef HAVE_SHADER_MANAGER
static inline struct gfx_shader *shader_manager_get_current_shader(void *data, unsigned type)
{
@ -502,7 +500,7 @@ static int menu_info_screen_iterate(unsigned action)
}
}
switch(info_selection_ptr)
switch (rgui->info_selection)
{
case RGUI_SETTINGS_WINDOW_COMPOSITING_ENABLE:
snprintf(msg, sizeof(msg),
@ -1276,8 +1274,8 @@ static int menu_settings_iterate(unsigned action)
case RGUI_ACTION_SELECT:
{
const char *path = NULL;
file_list_get_at_offset(rgui->selection_buf, rgui->selection_ptr, &path, &info_selection_ptr);
file_list_push(rgui->menu_stack, "", RGUI_INFO_SCREEN, 0);
file_list_get_at_offset(rgui->selection_buf, rgui->selection_ptr, &path, &rgui->info_selection);
file_list_push(rgui->menu_stack, "", RGUI_INFO_SCREEN, rgui->selection_ptr);
}
break;
case RGUI_ACTION_LEFT:

1
frontend/menu/menu_common.h
View File

@ -140,6 +140,7 @@ typedef struct
file_list_t *menu_stack;
file_list_t *selection_buf;
size_t selection_ptr;
unsigned info_selection;
bool need_refresh;
bool msg_force;
bool push_start_screen;