1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From: Beren Minor <beren.minor+git@gmail.com>
Date: Fri, 2 Jan 2015 02:07:57 +0100
Subject: 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 bb24408..f58544c 100644
--- a/gemrb/core/InterfaceConfig.cpp
+++ b/gemrb/core/InterfaceConfig.cpp
@@ -122,21 +122,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, ".gemrb");
+ PathJoinExt( path, datadir, name, "cfg" );
+ ATTEMPT_INIT;
+
+ CopyGemDataPath(datadir, _MAX_PATH);
+ PathJoinExt( path, datadir, name, "cfg" );
ATTEMPT_INIT;
#ifdef SYSCONF_DIR
|