Merge pull request #1152 from crazyquark/master

Fix crash on iOS
2014-10-14 21:56:28 +02:00 · 2014-10-14 21:56:28 +02:00 · da03f518bb
parent 707a5eaf0f 07c8f2442a
commit da03f518bb
1 changed files with 4 additions and 0 deletions
--- a/apple/iOS/menu.m
+++ b/apple/iOS/menu.m
@ -808,6 +808,10 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
         _pathToSave = BOXSTRING(g_defaults.config_path);
      }
      
+      // If we initialized with a nil core(like when starting up) driver.menu will be NULL
+      if (!driver.menu)
+         return NULL;
+      
      setting_data = (rarch_setting_t*)driver.menu->list_settings;
      
      if (!setting_data)