diff options
| author | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-29 19:45:01 +0000 |
|---|---|---|
| committer | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-01-29 19:45:01 +0000 |
| commit | e282d5c7f2a2b898bd2f4bf42efcbce827068c8d (patch) | |
| tree | ccd7a7d36d1900a8483a73e44f4fb3bac2eb25c7 /Source/Core/Common/Src/SysConf.cpp | |
| parent | 8b129fca0c23ce83172a01db143abae171bdd4c3 (diff) | |
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
Diffstat (limited to 'Source/Core/Common/Src/SysConf.cpp')
| -rw-r--r-- | Source/Core/Common/Src/SysConf.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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;
}
|