From 0295673869888ee3075b12e7e9681c5e1f167f71 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 7 Jul 2014 23:37:59 +0200
Subject: [PATCH] Reset item model when reference is reset (Fixes #1628)

This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
---
 apps/openmw/mwgui/companionwindow.cpp | 5 +++++
 apps/openmw/mwgui/companionwindow.hpp | 2 ++
 apps/openmw/mwgui/container.cpp       | 6 ++++++
 apps/openmw/mwgui/container.hpp       | 2 ++
 apps/openmw/mwgui/tradewindow.cpp     | 6 ++++++
 apps/openmw/mwgui/tradewindow.hpp     | 1 +
 6 files changed, 22 insertions(+)

diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index d0ac3e7c3..8d199e727 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -153,6 +153,11 @@ void CompanionWindow::onReferenceUnavailable()
     MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
 }
 
+void CompanionWindow::resetReference()
+{
+    ReferenceInterface::resetReference();
+    mItemView->setModel(NULL);
+}
 
 
 }
diff --git a/apps/openmw/mwgui/companionwindow.hpp b/apps/openmw/mwgui/companionwindow.hpp
index 006d0a3c3..dc460e2fc 100644
--- a/apps/openmw/mwgui/companionwindow.hpp
+++ b/apps/openmw/mwgui/companionwindow.hpp
@@ -20,6 +20,8 @@ namespace MWGui
 
         virtual void exit();
 
+        virtual void resetReference();
+
         void open(const MWWorld::Ptr& npc);
         void onFrame ();
 
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 011feb4d3..8da3def5f 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -258,6 +258,12 @@ namespace MWGui
             onTakeAllButtonClicked(mTakeButton);
     }
 
+    void ContainerWindow::resetReference()
+    {
+        ReferenceInterface::resetReference();
+        mItemView->setModel(NULL);
+    }
+
     void ContainerWindow::close()
     {
         WindowBase::close();
diff --git a/apps/openmw/mwgui/container.hpp b/apps/openmw/mwgui/container.hpp
index 5446a4ab7..79951f70e 100644
--- a/apps/openmw/mwgui/container.hpp
+++ b/apps/openmw/mwgui/container.hpp
@@ -54,6 +54,8 @@ namespace MWGui
         void open(const MWWorld::Ptr& container, bool loot=false);
         virtual void close();
 
+        virtual void resetReference();
+
         virtual void exit();
 
     private:
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index c0a51311f..19187cde1 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -531,4 +531,10 @@ namespace MWGui
             sellerStats.setLastRestockTime(MWBase::Environment::get().getWorld()->getTimeStamp());
         }
     }
+
+    void TradeWindow::resetReference()
+    {
+        ReferenceInterface::resetReference();
+        mItemView->setModel(NULL);
+    }
 }
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index cc70f1ae9..b487a8870 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -37,6 +37,7 @@ namespace MWGui
 
             virtual void exit();
 
+            virtual void resetReference();
 
         private:
             ItemView* mItemView;