From 53b4fe77160a8b4ce587c697959a359ba5b97018 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 12 Mar 2021 10:57:42 +0100
Subject: [PATCH] This ifdef is no longer needed, remove - also 'push' was
 always true so just hardcode it for this function

---
 menu/cbs/menu_cbs_ok.c |  2 +-
 menu/menu_dialog.h     |  3 +--
 retroarch.c            | 18 +++++-------------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index bd1793dd36..234d91e77b 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -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));
diff --git a/menu/menu_dialog.h b/menu/menu_dialog.h
index 0903b77f87..10e92c5dff 100644
--- a/menu/menu_dialog.h
+++ b/menu/menu_dialog.h
@@ -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);
 
diff --git a/retroarch.c b/retroarch.c
index 5e2dfed371..177340a57b 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -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(