From 502cc852da0f10dae95ba10ec363a2be66707304 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 26 Jun 2015 20:16:32 +0200
Subject: [PATCH] Handle encoding conversions when saving TES3 header (Fixes
 #2727)

---
 components/esm/esmwriter.cpp | 9 +++++++++
 components/esm/esmwriter.hpp | 1 +
 components/esm/loadtes3.cpp  | 8 +++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/components/esm/esmwriter.cpp b/components/esm/esmwriter.cpp
index c64678e70..4d9999143 100644
--- a/components/esm/esmwriter.cpp
+++ b/components/esm/esmwriter.cpp
@@ -174,6 +174,15 @@ namespace ESM
         endRecord(name);
     }
 
+    void ESMWriter::writeFixedSizeString(const std::string &data, int size)
+    {
+        std::string string;
+        if (!data.empty())
+            string = mEncoder ? mEncoder->getLegacyEnc(data) : data;
+        string.resize(size);
+        write(string.c_str(), string.size());
+    }
+
     void ESMWriter::writeHString(const std::string& data)
     {
         if (data.size() == 0)
diff --git a/components/esm/esmwriter.hpp b/components/esm/esmwriter.hpp
index 30cec58b4..d11b3c940 100644
--- a/components/esm/esmwriter.hpp
+++ b/components/esm/esmwriter.hpp
@@ -120,6 +120,7 @@ public:
         void startSubRecord(const std::string& name);
         void endRecord(const std::string& name);
         void endRecord(uint32_t name);
+        void writeFixedSizeString(const std::string& data, int size);
         void writeHString(const std::string& data);
         void writeHCString(const std::string& data);
         void writeName(const std::string& data);
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 9c0c55b8f..7d749c4d9 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -71,7 +71,13 @@ void ESM::Header::save (ESMWriter &esm)
     if (mFormat>0)
         esm.writeHNT ("FORM", mFormat);
 
-    esm.writeHNT ("HEDR", mData, 300);
+    esm.startSubRecord("HEDR");
+    esm.writeT(mData.version);
+    esm.writeT(mData.type);
+    esm.writeFixedSizeString(mData.author.toString(), 32);
+    esm.writeFixedSizeString(mData.desc.toString(), 256);
+    esm.writeT(mData.records);
+    esm.endRecord("HEDR");
 
     for (std::vector<Header::MasterData>::iterator iter = mMaster.begin();
          iter != mMaster.end(); ++iter)