From b6c6bfe94386d51e6262e3f294f8c90a97d08ccb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 19 Sep 2014 05:02:54 +0200
Subject: [PATCH] Merge cell names when merging cells (Fixes #1929)

---
 apps/openmw/mwworld/store.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp
index 7ef06e841..caf4083fe 100644
--- a/apps/openmw/mwworld/store.cpp
+++ b/apps/openmw/mwworld/store.cpp
@@ -58,6 +58,7 @@ void Store<ESM::Cell>::load(ESM::ESMReader &esm, const std::string &id)
             // merge new cell into old cell
             // push the new references on the list of references to manage (saveContext = true)
             oldcell->mData = cell.mData;
+            oldcell->mName = cell.mName; // merge name just to be sure (ID will be the same, but case could have been changed)
             oldcell->loadCell(esm, true);
         } else
         {
@@ -74,6 +75,7 @@ void Store<ESM::Cell>::load(ESM::ESMReader &esm, const std::string &id)
         if (oldcell) {
             // merge new cell into old cell
             oldcell->mData = cell.mData;
+            oldcell->mName = cell.mName;
             oldcell->loadCell(esm, false);
 
             // handle moved ref (MVRF) subrecords