From 816d7bba1f3842146fa12c98232070559e72e807 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 15 Feb 2015 17:29:06 +0100
Subject: osxbundle: config file special case isn't needed anymore

The previous commit effectively fixes the mess caused by 'config' vs.
'mpv.conf', and the hack introduced by commit e01a6dac and extended by
commit db167cd4 isn't needed anymore.
---
 player/configfiles.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'player/configfiles.c')

diff --git a/player/configfiles.c b/player/configfiles.c
index 463d1a4f41..bc89439e3a 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -84,12 +84,6 @@ void mp_parse_cfgfiles(struct MPContext *mpctx)
     talloc_free(cf);
 #endif
 
-    // Stupid hack to set OSX bundle defaults, if applicable. (The file is only
-    // found if starting from the OSX bundle.)
-#if HAVE_COCOA
-    load_all_cfgfiles(mpctx, section, "osx-bundle.conf");
-#endif
-
     load_all_cfgfiles(mpctx, section, "mpv.conf|config");
 
     if (encoding)
-- 
cgit v1.2.3