From 09ee27337ced66406062c621361f3a0d4d8f664e Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sat, 18 Jul 2015 15:07:16 +0200
Subject: [PATCH] (OSX) Fix crash at exit

---
 .../xcshareddata/RetroArch_iOS.xccheckout                 | 8 ++++----
 retroarch.c                                               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
index ce9ddfe89a..92a419b12f 100644
--- a/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
+++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.xcworkspace/xcshareddata/RetroArch_iOS.xccheckout
@@ -28,17 +28,17 @@
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
 		<key>6B9F0B13E5864452B91F13C09B7ED9EB989E82AD</key>
-		<string>../../../..media/autoconfig/</string>
+		<string>../../../..media/autoconfig</string>
 		<key>76200F0D6584D865E96F58DE862E738E88B23A3C</key>
 		<string>../../../../..</string>
 		<key>A267D9543F572B4C32EC6E1B876E3B9BFE4DE8F6</key>
-		<string>../../../..media/assets/</string>
+		<string>../../../..media/assets</string>
 		<key>C3AEE01BDA902108663DB5DB9CD7916436919463</key>
-		<string>../../../..media/libretrodb/</string>
+		<string>../../../..media/libretrodb</string>
 		<key>C7C12374C7051F8843B3EFA1ACCAF2907102CCF7</key>
 		<string>../../../..</string>
 		<key>EF363D58F01B3FB341FA6C851870E60E4F080E97</key>
-		<string>../../../..media/overlays/</string>
+		<string>../../../..media/overlays</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
 	<string>https://github.com/libretro/RetroArch.git</string>
diff --git a/retroarch.c b/retroarch.c
index 47dd19d6af..1f1fddc5ec 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1458,7 +1458,7 @@ void rarch_main_set_state(unsigned cmd)
 #endif
          video_driver_set_texture_enable(false, false);
 #ifdef HAVE_OVERLAY
-         if (settings->input.overlay_hide_in_menu)
+         if (settings && settings->input.overlay_hide_in_menu)
             event_command(EVENT_CMD_OVERLAY_INIT);
 #endif
          break;