From 0017fc68ef719135cdf82060fbf19e1df4582377 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Sat, 19 Jul 2014 13:08:28 +0200
Subject: [PATCH] fixed ctor of nestedwrapper (missing initialization of member
 data field)

---
 apps/opencs/model/world/nestedtablewrapper.hpp | 3 ++-
 apps/opencs/model/world/refidadapterimp.cpp    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/model/world/nestedtablewrapper.hpp b/apps/opencs/model/world/nestedtablewrapper.hpp
index 9fc21f8e0..c13a12c62 100644
--- a/apps/opencs/model/world/nestedtablewrapper.hpp
+++ b/apps/opencs/model/world/nestedtablewrapper.hpp
@@ -20,7 +20,8 @@ namespace CSMWorld
 
     public:
         
-        NestedTableWrapper(const NestedTable& nestedTable) {}
+        NestedTableWrapper(const NestedTable& nestedTable) 
+            : mNestedTable(nestedTable) {}
 
         NestedTable getNestedTable() const
         {
diff --git a/apps/opencs/model/world/refidadapterimp.cpp b/apps/opencs/model/world/refidadapterimp.cpp
index cb078ab74..d669a369c 100644
--- a/apps/opencs/model/world/refidadapterimp.cpp
+++ b/apps/opencs/model/world/refidadapterimp.cpp
@@ -1,9 +1,10 @@
 #include "refidadapterimp.hpp"
-#include "nestedtablewrapper.hpp"
 
 #include <cassert>
 #include <stdexcept>
+
 #include <components/esm/loadcont.hpp>
+#include "nestedtablewrapper.hpp"
 
 CSMWorld::PotionRefIdAdapter::PotionRefIdAdapter (const InventoryColumns& columns,
     const RefIdColumn *autoCalc)
@@ -315,7 +316,7 @@ void CSMWorld::ContainerRefIdAdapter::setNestedTable(const RefIdColumn* column,
     Record<ESM::Container>& record = dynamic_cast<Record<ESM::Container>&> (
         data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container)));
 
-    record.get().mInventory.mList = dynamic_cast<const NestedTableWrapper<std::vector<ESM::ContItem> >&>(nestedTable).getNestedTable();
+    record.get().mInventory.mList = (dynamic_cast<const NestedTableWrapper<std::vector<ESM::ContItem> >&>(nestedTable)).getNestedTable();
 }
 
 CSMWorld::NestedTableWrapperBase CSMWorld::ContainerRefIdAdapter::nestedTable (const RefIdColumn* column,