From e282d5c7f2a2b898bd2f4bf42efcbce827068c8d Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Fri, 29 Jan 2010 19:45:01 +0000 Subject: Fixes Issue 2176 (SysConf on OSX), plus some initialization order warning fix in VolumeDirectory.cpp git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4985 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/SysConf.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Source/Core/Common/Src/SysConf.cpp') diff --git a/Source/Core/Common/Src/SysConf.cpp b/Source/Core/Common/Src/SysConf.cpp index 38c4f6f549..13fb688a0d 100644 --- a/Source/Core/Common/Src/SysConf.cpp +++ b/Source/Core/Common/Src/SysConf.cpp @@ -21,7 +21,11 @@ SysConf::SysConf() : m_IsValid(false) { +#if defined(__APPLE__) + if (LoadFromFile(File::GetSysConfDirectory())) +#else if (LoadFromFile(WII_SYSCONF_FILE)) +#endif m_IsValid = true; } -- cgit v1.2.3