From aa04b4857914ebe70b5dd8966854198cd6f6654c Mon Sep 17 00:00:00 2001
From: Twinaphex <libretro@gmail.com>
Date: Sun, 20 Jul 2014 01:14:16 +0200
Subject: [PATCH] (Apple) Remove configDirectory

---
 apple/OSX/platform.h           |  2 --
 apple/OSX/platform.m           | 12 ++++--------
 apple/common/RetroArch_Apple.h |  2 --
 apple/iOS/platform.h           |  2 --
 apple/iOS/platform.m           |  6 +++---
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/apple/OSX/platform.h b/apple/OSX/platform.h
index 541e23bf81..706148dfcf 100644
--- a/apple/OSX/platform.h
+++ b/apple/OSX/platform.h
@@ -35,7 +35,6 @@
 @interface RetroArch_OSX : NSObject<RetroArch_Platform>
 {
    NSWindow* _window;
-   NSString* _configDirectory;
    NSWindowController* _settingsWindow;
    NSWindow* _coreSelectSheet;
    NSString* _file;
@@ -46,7 +45,6 @@
 }
 
 @property (nonatomic, retain) NSWindow IBOutlet* window;
-@property (nonatomic, copy) NSString* configDirectory;    // e.g. /var/mobile/Documents/.RetroArch
 
 + (RetroArch_OSX*)get;
 
diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 6416e469b7..4ea7a37733 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -101,7 +101,6 @@ static char** waiting_argv;
 @implementation RetroArch_OSX
 
 @synthesize window = _window;
-@synthesize configDirectory = _configDirectory;
 @synthesize settingsWindow = _settingsWindow;
 @synthesize coreSelectSheet = _coreSelectSheet;
 @synthesize file = _file;
@@ -110,7 +109,6 @@ static char** waiting_argv;
 - (void)dealloc
 {
    [_window release];
-   [_configDirectory release];
    [_coreSelectSheet release];
    [_settingsWindow release];
    [_file release];
@@ -125,17 +123,15 @@ static char** waiting_argv;
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-   NSArray *paths;
    NSComboBox* cb;
    const core_info_list_t* core_list;
    int i;
-    
+   NSString *paths = [NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES) firstObject];
    apple_platform = self;
    _loaded = true;
 
-   paths = (NSArray*)NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-   self.configDirectory = [[paths objectAtIndex:0] stringByAppendingPathComponent:BOXSTRING("RetroArch")];
-   snprintf(g_defaults.config_path, sizeof(g_defaults.config_path), "%s/retroarch.cfg", self.configDirectory.UTF8String);
+    snprintf(g_defaults.menu_config_dir, sizeof(g_defaults.menu_config_dir), "%s/%s", paths.UTF8String, "RetroArch");
+   snprintf(g_defaults.config_path, sizeof(g_defaults.config_path), "%s/retroarch.cfg", g_defaults.menu_config_dir);
    snprintf(g_defaults.core_dir, sizeof(g_defaults.core_dir), "%s/%s", NSBundle.mainBundle.bundlePath.UTF8String, "Contents/Resources/modules");
    
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
@@ -152,7 +148,7 @@ static char** waiting_argv;
    self.settingsWindow = [[[NSWindowController alloc] initWithWindowNibName:BOXSTRING("Settings")] autorelease];
    
    core_info_set_core_path(g_defaults.core_dir);
-   core_info_set_config_path(self.configDirectory.UTF8String);
+   core_info_set_config_path(g_defaults.menu_config_dir);
    core_list = (const core_info_list_t*)core_info_list_get();
 
    // Create core select list
diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h
index 08dbd8409c..a30f7b6d98 100644
--- a/apple/common/RetroArch_Apple.h
+++ b/apple/common/RetroArch_Apple.h
@@ -30,8 +30,6 @@
 @protocol RetroArch_Platform
 - (void)loadingCore:(NSString*)core withFile:(const char*)file;
 - (void)unloadingCore:(NSString*)core;
-
-- (NSString*)configDirectory;   // < This returns the directory that contains retroarch.cfg and other custom configs
 @end
 
 #ifdef IOS
diff --git a/apple/iOS/platform.h b/apple/iOS/platform.h
index d02514f10a..b1e09f6860 100644
--- a/apple/iOS/platform.h
+++ b/apple/iOS/platform.h
@@ -46,8 +46,6 @@ const void* apple_get_frontend_settings(void);
 
 - (void)refreshSystemConfig;
 
-
-@property (nonatomic) NSString* configDirectory;    // e.g. /var/mobile/Documents/.RetroArch
 @property (nonatomic) NSString* documentsDirectory; // e.g. /var/mobile/Documents
 
 @end
diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m
index c58a6115cf..c981ee0bf4 100644
--- a/apple/iOS/platform.m
+++ b/apple/iOS/platform.m
@@ -200,8 +200,8 @@ static void handle_touch_event(NSArray* touches)
    self.documentsDirectory = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
     snprintf(g_defaults.system_dir, sizeof(g_defaults.system_dir), "%s/%s", self.documentsDirectory.UTF8String, ".RetroArch");
    
-   self.configDirectory = BOXSTRING(g_defaults.system_dir);
-    snprintf(g_defaults.config_path, sizeof(g_defaults.config_path), "%s/retroarch.cfg", self.configDirectory.UTF8String);
+    strlcpy(g_defaults.menu_config_dir, g_defaults.system_dir, sizeof(g_defaults.menu_config_dir));
+    snprintf(g_defaults.config_path, sizeof(g_defaults.config_path), "%s/retroarch.cfg", g_defaults.menu_config_dir);
     snprintf(g_defaults.core_dir, sizeof(g_defaults.core_dir), "%s/%s", NSBundle.mainBundle.bundlePath.UTF8String, "modules");
     
     path = (const char*)self.documentsDirectory.UTF8String;
@@ -230,7 +230,7 @@ static void handle_touch_event(NSArray* touches)
    
    // Warn if there are no cores present
    core_info_set_core_path(g_defaults.core_dir);
-   core_info_set_config_path(self.configDirectory.UTF8String);
+   core_info_set_config_path(g_defaults.menu_config_dir);
    core_list = (const core_info_list_t*)core_info_list_get();
    
    if (!core_list || core_list->count == 0)