mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-13 21:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Issue #567: workaround for crash with non-English ESX files

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-02-17 19:26:01 +01:00
parent 170a9762ac
commit abd307d70e
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/world/data.cpp
View File

@ -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

2
apps/opencs/view/doc/opendialog.cpp
View File

@ -11,7 +11,7 @@ OpenDialog::OpenDialog(QWidget * parent) : QDialog(parent)
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;