aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorEugene Sandulenko2006-03-25 19:30:10 +0000
committerEugene Sandulenko2006-03-25 19:30:10 +0000
commite373c9b7b56d3b4b80ab2357363fdc4e48c97e16 (patch)
treee8932f866a6470dd6da33185defa6b2ec22b6e14 /base
parentf25d49f826b7ddfd9ce96beca6f0b0a0a6d82a00 (diff)
downloadscummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.tar.gz
scummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.tar.bz2
scummvm-rg350-e373c9b7b56d3b4b80ab2357363fdc4e48c97e16.zip
- Revert my last change with moving addDefaultDirectory() from TheneNew.cpp
- Removed locking of further directory adds because it did not work for themes. svn-id: r21452
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/base/main.cpp b/base/main.cpp
index cd118ade30..6eacd122f8 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -314,13 +314,8 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String
if (ConfMan.hasKey("extrapath", Common::ConfigManager::kApplicationDomain))
Common::File::addDefaultDirectoryRecursive(ConfMan.get("extrapath", Common::ConfigManager::kApplicationDomain));
- // Theme-related
- if (ConfMan.hasKey("themepath")) {
- Common::File::addDefaultDirectory(ConfMan.get("themepath"));
- }
-
- // As a last resort add current directory and lock further additions
- Common::File::addDefaultDirectory(".", true);
+ // As a last resort add current directory
+ Common::File::addDefaultDirectory(".");
int result;