From 96f106d992d344796f915d142ab3656c44ac7b63 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 30 Jan 2015 09:24:48 +0100
Subject: [PATCH] Add HAVE_LIBRETRODB

---
 apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj | 4 ++++
 menu/menu_entries_cbs.c                               | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj
index 36d0cee0b1..7806b3ed67 100644
--- a/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj
+++ b/apple/OSX/OSX/RetroArch_OSX.xcodeproj/project.pbxproj
@@ -440,6 +440,7 @@
 					"-DHAVE_GLUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_LIBRETRODB",
 				);
 				PRODUCT_NAME = "RetroArch 10.6";
 				SDKROOT = macosx;
@@ -511,6 +512,7 @@
 					"-DHAVE_GLUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_LIBRETRODB",
 				);
 				PRODUCT_NAME = "RetroArch 10.6";
 				SDKROOT = macosx;
@@ -625,6 +627,7 @@
 					"-DHAVE_GLUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_LIBRETRODB",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
@@ -696,6 +699,7 @@
 					"-DHAVE_GLUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_LIBRETRODB",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 5c84473a64..b1fddfd43d 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -575,7 +575,8 @@ static int action_ok_core_load_deferred(const char *path,
    if (!driver.menu)
       return -1;
 
-   strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
+   if (path)
+      strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
    strlcpy(g_extern.fullpath, driver.menu->deferred_path,
          sizeof(g_extern.fullpath));