[gemrb] 05/06: DEBIAN: Try config file from ~/.gemrb before trying from /etc

[Beren Minor]

This is an automated email from the git hooks/post-receive script.

berenm-guest pushed a commit to branch patch-queue/master
in repository gemrb.

commit 92809635c3af85910e20583d18198914b2f2dd89
Author: Beren Minor <beren.minor+git at gmail.com>
Date:   Fri Jan 2 02:07:57 2015 +0100

    DEBIAN: Try config file from ~/.gemrb before trying from /etc
---
 gemrb/core/InterfaceConfig.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/gemrb/core/InterfaceConfig.cpp b/gemrb/core/InterfaceConfig.cpp
index 5db7689..425971a 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -128,21 +128,19 @@ CFGConfig::CFGConfig(int argc, char *argv[])
 		strlcpy(name, appName, _MAX_PATH);
 		assert(name[0]);
 
-#if TARGET_OS_MAC
-		// CopyGemDataPath would give us bundle resources dir
-		CopyHomePath(datadir, _MAX_PATH);
-		PathAppend(datadir, PACKAGE);
-#else
-		CopyGemDataPath(datadir, _MAX_PATH);
-#endif
-		PathJoinExt( path, datadir, name, "cfg" );
-
 #define ATTEMPT_INIT \
 if (config->Open(path) \
 	&& InitWithINIData(config)) { \
 		goto done; \
 	}
 
+		CopyHomePath(datadir, _MAX_PATH);
+		PathAppend(datadir, "." PACKAGE);
+		PathJoinExt( path, datadir, name, "cfg" );
+		ATTEMPT_INIT;
+
+		CopyGemDataPath(datadir, _MAX_PATH);
+		PathJoinExt( path, datadir, name, "cfg" );
 		ATTEMPT_INIT;
 
 #ifdef SYSCONF_DIR

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git