From d5f1d7eed7517eb4a9df03abea61060ed2c3187b Mon Sep 17 00:00:00 2001
From: Lukasz Gromanowski <lgromanowski@gmail.com>
Date: Wed, 22 Feb 2012 23:56:07 +0100
Subject: [PATCH] Fix for processing tokens inside data-local config option.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
---
 apps/openmw/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index dd7a1e7805..ec1775ac83 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -160,7 +160,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
     engine.enableFSStrict(variables["fs-strict"].as<bool>());
 
     Files::PathContainer dataDirs(variables["data"].as<Files::PathContainer>());
-    cfgMgr.processPaths(dataDirs);
 
     std::string local(variables["data-local"].as<std::string>());
     if (!local.empty())
@@ -173,6 +172,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         dataDirs.push_back(cfgMgr.getLocalPath());
     }
 
+    cfgMgr.processPaths(dataDirs);
+
     engine.setDataDirs(dataDirs);
 
     engine.setResourceDir(variables["resources"].as<std::string>());