summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/resources/db/palettedb.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 47253b5dd..82540150b 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -625,6 +625,7 @@ DefaultsData* getPathsDefaults()
AddDEF("inactivebadge", "inactive.xml");
AddDEF("awaybadge", "away.xml");
+ AddDEF("palettesDir", "");
AddDEF("defaultPaletteFile", "palette.gpl");
return configData;
diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp
index 3c7abe6af..3ad2b13fa 100644
--- a/src/resources/db/palettedb.cpp
+++ b/src/resources/db/palettedb.cpp
@@ -49,8 +49,8 @@ void PaletteDB::loadPalette()
{
mLoaded = true;
StringVect lines;
- Files::loadTextFile(paths.getStringValue(
- "defaultPaletteFile"),
+ Files::loadTextFile(paths.getStringValue("palettesDir") +
+ paths.getStringValue("defaultPaletteFile"),
lines);
StringVectCIter it = lines.begin();
if (it == lines.end())