From 2284d76307382c5088cbb3697c68cc113e474dc5 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 4 Sep 2012 11:02:18 +0200
Subject: [PATCH] re-enabled local data directory support in launcher

---
 apps/launcher/datafilespage.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 8545be835..64816fae5 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -197,7 +197,7 @@ bool DataFilesPage::setupDataFiles()
 
     desc.add_options()
         ("data", boost::program_options::value<Files::PathContainer>()->default_value(Files::PathContainer(), "data")->multitoken())
-//        ("data-local", boost::program_options::value<std::string>()->default_value(""))
+        ("data-local", boost::program_options::value<std::string>()->default_value(""))
         ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
         ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
 
@@ -206,11 +206,10 @@ bool DataFilesPage::setupDataFiles()
     // Put the paths in a boost::filesystem vector to use with Files::Collections
     mDataDirs = Files::PathContainer(variables["data"].as<Files::PathContainer>());
 
-//     std::string local = variables["data-local"].as<std::string>();
-//     if (!local.empty()) {
-//         mDataLocal.push_back(Files::PathContainer::value_type(local));
-//         dataDirs.push_back(Files::PathContainer::value_type(local));
-//     }
+     std::string local = variables["data-local"].as<std::string>();
+     if (!local.empty()) {
+         mDataLocal.push_back(Files::PathContainer::value_type(local));
+     }
 
     if (mDataDirs.size()>1)
         mDataDirs.resize (1);