From 6cd739678af152c7f47958e1b65bb2d411125e43 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 14 Jul 2014 16:53:58 +0200
Subject: [PATCH] Fix dangling model pointer after reference cleanup (Fixes
 #1653)

---
 apps/openmw/mwgui/companionwindow.cpp | 2 ++
 apps/openmw/mwgui/container.cpp       | 2 ++
 apps/openmw/mwgui/tradewindow.cpp     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index 8d199e7275..6ac8c9d187 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -157,6 +157,8 @@ void CompanionWindow::resetReference()
 {
     ReferenceInterface::resetReference();
     mItemView->setModel(NULL);
+    mModel = NULL;
+    mSortModel = NULL;
 }
 
 
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 8da3def5fa..65a9e07c40 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -262,6 +262,8 @@ namespace MWGui
     {
         ReferenceInterface::resetReference();
         mItemView->setModel(NULL);
+        mModel = NULL;
+        mSortModel = NULL;
     }
 
     void ContainerWindow::close()
diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 19187cde1f..c56c2ee94a 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -536,5 +536,7 @@ namespace MWGui
     {
         ReferenceInterface::resetReference();
         mItemView->setModel(NULL);
+        mTradeModel = NULL;
+        mSortModel = NULL;
     }
 }