From 0d14c588d2e98ab7d91c31495c270583d6897bf7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 11 Jan 2016 13:24:05 +0100
Subject: [PATCH] Cleanups

---
 menu/menu_driver.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index a5a0459ca2..99a19466d2 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -601,26 +601,24 @@ void *menu_init(const void *data)
       goto error;
 #endif
 
-   menu->push_help_screen           = settings->menu_show_start_screen;
-   menu->help_screen_type           = MENU_HELP_WELCOME;
-   settings->menu_show_start_screen = false;
+   if (settings->menu_show_start_screen)
+   {
+      menu->push_help_screen           = true;
+      menu->help_screen_type           = MENU_HELP_WELCOME;
+      settings->menu_show_start_screen = false;
+   }
 
-   if (
-             settings->bundle_assets_extract_enable
+   if (      settings->bundle_assets_extract_enable
          && !string_is_empty(settings->bundle_assets_src_path) 
          && !string_is_empty(settings->bundle_assets_dst_path)
-#ifdef IOS
          && menu->push_help_screen
-#else
-         && settings->bundle_assets_extract_version_current != settings->bundle_assets_extract_last_version
+#ifndef IOS
+         && (settings->bundle_assets_extract_version_current != settings->bundle_assets_extract_last_version)
 #endif
       )
    {
       menu->help_screen_type           = MENU_HELP_EXTRACT;
       menu->push_help_screen           = true;
-#ifdef IOS
-      settings->menu_show_start_screen = false;
-#endif
 #ifdef HAVE_ZLIB
       rarch_task_push_decompress(settings->bundle_assets_src_path, settings->bundle_assets_dst_path,
          settings->bundle_assets_dst_path_subdir, NULL, bundle_decompressed, NULL);