From af0e91c2d348b93d65a8db36582db27dac6de971 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 22 Jan 2015 15:21:03 +0100
Subject: [PATCH] ESSImport: stolen items reading fix

---
 apps/essimporter/converter.hpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/apps/essimporter/converter.hpp b/apps/essimporter/converter.hpp
index 9894de299..7565b78d4 100644
--- a/apps/essimporter/converter.hpp
+++ b/apps/essimporter/converter.hpp
@@ -364,15 +364,18 @@ public:
     {
         std::string itemid = esm.getHNString("NAME");
 
-        while (esm.isNextSub("ONAM"))
+        while (esm.isNextSub("FNAM") || esm.isNextSub("ONAM"))
         {
-            std::string ownerid = esm.getHString();
-            mStolenItems.insert(std::make_pair(itemid, ownerid));
-        }
-        while (esm.isNextSub("FNAM"))
-        {
-            std::string factionid = esm.getHString();
-            mFactionStolenItems.insert(std::make_pair(itemid, factionid));
+            if (esm.retSubName().toString() == "FNAM")
+            {
+                std::string factionid = esm.getHString();
+                mFactionStolenItems.insert(std::make_pair(itemid, factionid));
+            }
+            else
+            {
+                std::string ownerid = esm.getHString();
+                mStolenItems.insert(std::make_pair(itemid, ownerid));
+            }
         }
     }
 private: