mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

This ifdef is no longer needed, remove - also 'push'

Browse Source 
was always true so just hardcode it for this function
This commit is contained in:
twinaphex 2021-03-12 10:57:42 +01:00
parent 117d48c898
commit 53b4fe7716
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_ok.c
View File

@ -823,8 +823,8 @@ int generic_action_ok_displaylist_push(const char *path,
break;
case ACTION_OK_DL_HELP:
info_label = label;
menu_dialog_push_pending(true, (enum menu_dialog_type)type);
dl_type = DISPLAYLIST_HELP;
menu_dialog_push_pending((enum menu_dialog_type)type);
break;
case ACTION_OK_DL_RPL_ENTRY:
strlcpy(menu->deferred_path, label, sizeof(menu->deferred_path));

3
menu/menu_dialog.h
View File

@ -59,8 +59,7 @@ typedef struct menu_dialog menu_dialog_t;
RETRO_BEGIN_DECLS
bool menu_dialog_push_pending(
bool push, enum menu_dialog_type type);
bool menu_dialog_push_pending(enum menu_dialog_type type);
void menu_dialog_unset_pending_push(void);

18
retroarch.c
View File

@ -820,20 +820,12 @@ void menu_dialog_unset_pending_push(void)
p_dialog->pending_push = false;
}
bool menu_dialog_push_pending(bool push, enum menu_dialog_type type)
bool menu_dialog_push_pending(enum menu_dialog_type type)
{
struct rarch_state *p_rarch = &rarch_st;
menu_dialog_t *p_dialog = &p_rarch->dialog_st;
#ifdef IOS
/* TODO/FIXME - see comment in menu_init -
* we should make this more generic so that
* this platform-specific ifdef is no longer needed */
if (type == MENU_DIALOG_HELP_EXTRACT)
if (!p_dialog->pending_push)
return false;
#endif
p_dialog->pending_push = push;
p_dialog->current_type = type;
p_dialog->current_type = type;
p_dialog->pending_push = true;
return true;
}
@ -3839,7 +3831,7 @@ static bool menu_init(
* again after the first startup, so we save to config
* file immediately. */
menu_dialog_push_pending(true, MENU_DIALOG_WELCOME);
menu_dialog_push_pending(MENU_DIALOG_WELCOME);
configuration_set_bool(settings,
settings->bools.menu_show_start_screen, false);
@ -3855,7 +3847,7 @@ static bool menu_init(
!= settings->uints.bundle_assets_extract_last_version)
)
{
if (menu_dialog_push_pending(true, MENU_DIALOG_HELP_EXTRACT))
if (menu_dialog_push_pending(MENU_DIALOG_HELP_EXTRACT))
{
#ifdef HAVE_COMPRESSION
task_push_decompress(