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

Merge pull request #8799 from jdgleaver/history-fix

Browse Source 
Fix history playlist navigation after running content
This commit is contained in:
Twinaphex 2019-05-17 15:41:41 +02:00 committed by GitHub
commit 3a3eb78ac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
menu/menu_displaylist.c
View File

@ -4437,6 +4437,36 @@ unsigned menu_displaylist_build_list(file_list_t *list, enum menu_displaylist_ct
return count; return count;
} }
/* Returns true if selection pointer should be reset
* to zero when viewing specified history playlist */
#ifndef IS_SALAMANDER
static bool history_needs_navigation_clear(menu_handle_t *menu, playlist_t *playlist)
{
if (!menu)
return false;
/* If content is running, compare last selected path
* with current content path */
if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
return string_is_equal(menu->deferred_path, path_get(RARCH_PATH_CONTENT));
/* If content is not running, have to examine the
* playlist... */
if (!playlist)
return false;
if (menu->rpl_entry_selection_ptr < playlist_size(playlist))
{
const struct playlist_entry *entry = NULL;
playlist_get_index(playlist, menu->rpl_entry_selection_ptr, &entry);
return !string_is_equal(menu->deferred_path, entry->path);
}
return false;
}
#endif
bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
menu_displaylist_info_t *info) menu_displaylist_info_t *info)
{ {
@ -5131,9 +5161,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
MENU_INFO_MESSAGE, 0, 0); MENU_INFO_MESSAGE, 0, 0);
} }
ret = 0; ret = 0;
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
#ifndef IS_SALAMANDER
info->need_navigation_clear =
history_needs_navigation_clear(menu, g_defaults.content_history);
#endif
break; break;
case DISPLAYLIST_FAVORITES: case DISPLAYLIST_FAVORITES:
{ {
@ -5193,8 +5228,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (ret == 0) if (ret == 0)
{ {
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
#ifndef IS_SALAMANDER
info->need_navigation_clear =
history_needs_navigation_clear(menu, g_defaults.music_history);
#endif
} }
break; break;
case DISPLAYLIST_VIDEO_HISTORY: case DISPLAYLIST_VIDEO_HISTORY:
@ -5230,8 +5269,12 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
if (ret == 0) if (ret == 0)
{ {
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
#if !defined(IS_SALAMANDER) && (defined(HAVE_FFMPEG) || defined(HAVE_MPV))
info->need_navigation_clear =
history_needs_navigation_clear(menu, g_defaults.video_history);
#endif
} }
break; break;
case DISPLAYLIST_SYSTEM_INFO: case DISPLAYLIST_SYSTEM_INFO:
@ -7199,9 +7242,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
ret = 0; ret = 0;
} }
ret = 0; ret = 0;
info->need_refresh = true; info->need_refresh = true;
info->need_push = true; info->need_push = true;
#if !defined(IS_SALAMANDER) && defined(HAVE_IMAGEVIEWER)
info->need_navigation_clear =
history_needs_navigation_clear(menu, g_defaults.image_history);
#endif
break; break;
case DISPLAYLIST_VIDEO_FILTERS: case DISPLAYLIST_VIDEO_FILTERS:
case DISPLAYLIST_CONFIG_FILES: case DISPLAYLIST_CONFIG_FILES: