From 4d39d77eaa39f2c904591eb3b3e1d82494f32d07 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 17 Jul 2014 20:40:40 +0200
Subject: [PATCH] Fix incompatible encoding names in ContentModel (bug
 uncovered by 41c17bccb6f16)

---
 components/contentselector/model/contentmodel.cpp | 3 ++-
 components/contentselector/model/contentmodel.hpp | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp
index f5bc2369a4..e76930e81e 100644
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@@ -23,6 +23,7 @@ ContentSelectorModel::ContentModel::ContentModel(QObject *parent) :
 
 void ContentSelectorModel::ContentModel::setEncoding(const QString &encoding)
 {
+    mEncoding = encoding;
     if (encoding == QLatin1String("win1252"))
         mCodec = QTextCodec::codecForName("windows-1252");
 
@@ -449,7 +450,7 @@ void ContentSelectorModel::ContentModel::addFiles(const QString &path)
         try {
             ESM::ESMReader fileReader;
             ToUTF8::Utf8Encoder encoder =
-            ToUTF8::calculateEncoding(QString(mCodec->name()).toStdString());
+            ToUTF8::calculateEncoding(mEncoding.toStdString());
             fileReader.setEncoder(&encoder);
             fileReader.open(dir.absoluteFilePath(path).toStdString());
 
diff --git a/components/contentselector/model/contentmodel.hpp b/components/contentselector/model/contentmodel.hpp
index 6d147bce98..7b2000b510 100644
--- a/components/contentselector/model/contentmodel.hpp
+++ b/components/contentselector/model/contentmodel.hpp
@@ -64,6 +64,7 @@ namespace ContentSelectorModel
         ContentFileList mFiles;
         QHash<QString, Qt::CheckState> mCheckStates;
         QTextCodec *mCodec;
+        QString mEncoding;
 
     public: