From abd307d70e946b9efe259ce6c4ed54d8f2af6b53 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 17 Feb 2013 19:26:01 +0100
Subject: [PATCH] Issue #567: workaround for crash with non-English ESX files

---
 apps/opencs/model/world/data.cpp    |  6 +++++-
 apps/opencs/view/doc/opendialog.cpp | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index f120c75f10..92bd2bdb04 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -72,7 +72,11 @@ void CSMWorld::Data::merge()
 void CSMWorld::Data::loadFile (const boost::filesystem::path& path, bool base)
 {
     ESM::ESMReader reader;
-    /// \todo set encoder
+
+    /// \todo set encoding properly, once config implementation has been fixed.
+    ToUTF8::Utf8Encoder encoder (ToUTF8::calculateEncoding ("win1252"));
+    reader.setEncoder (&encoder);
+
     reader.open (path.string());
 
     // Note: We do not need to send update signals here, because at this point the model is not connected
diff --git a/apps/opencs/view/doc/opendialog.cpp b/apps/opencs/view/doc/opendialog.cpp
index 9a5feb23a7..7b62aafa31 100644
--- a/apps/opencs/view/doc/opendialog.cpp
+++ b/apps/opencs/view/doc/opendialog.cpp
@@ -10,48 +10,48 @@ OpenDialog::OpenDialog(QWidget * parent) : QDialog(parent)
     QVBoxLayout *layout = new QVBoxLayout(this);
     mFileSelector = new DataFilesList(mCfgMgr, this);
     layout->addWidget(mFileSelector);
-    
-    //FIXME - same as DataFilesPage::setupDataFiles
+
+    /// \todo move config to Editor class and add command line options.
     // We use the Configuration Manager to retrieve the configuration values
     boost::program_options::variables_map variables;
     boost::program_options::options_description desc;
-    
+
     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(""))
     ("fs-strict", boost::program_options::value<bool>()->implicit_value(true)->default_value(false))
     ("encoding", boost::program_options::value<std::string>()->default_value("win1252"));
-    
+
     boost::program_options::notify(variables);
-    
+
     mCfgMgr.readConfiguration(variables, desc);
-    
+
     Files::PathContainer mDataDirs, mDataLocal;
     if (!variables["data"].empty()) {
         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));
     }
-    
+
     mCfgMgr.processPaths(mDataDirs);
     mCfgMgr.processPaths(mDataLocal);
-    
+
     // Set the charset for reading the esm/esp files
     QString encoding = QString::fromStdString(variables["encoding"].as<std::string>());
-    
+
     Files::PathContainer dataDirs;
     dataDirs.insert(dataDirs.end(), mDataDirs.begin(), mDataDirs.end());
     dataDirs.insert(dataDirs.end(), mDataLocal.begin(), mDataLocal.end());
     mFileSelector->setupDataFiles(dataDirs, encoding);
-    
+
     buttonBox = new QDialogButtonBox(QDialogButtonBox::Open | QDialogButtonBox::Cancel, Qt::Horizontal, this);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
     layout->addWidget(buttonBox);
-    
+
     setLayout(layout);
     setWindowTitle(tr("Open"));
 }