From bcd95847a435bb3aab90bdb3c2fdada6063efc2e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 22 Apr 2014 21:54:59 +0300
Subject: Fix crash if start trade with opened storage.

---
 src/net/ea/inventoryhandler.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/net/ea/inventoryhandler.cpp')

diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index f3c8040e1..ea7390ccb 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -486,6 +486,11 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED)
 {
     // Storage access has been closed
     // Storage window deletes itself
+    if (mStorageWindow)
+    {
+        mStorageWindow->unsetInventory();
+        mStorageWindow->close();
+    }
     mStorageWindow = nullptr;
 
     if (mStorage)
@@ -592,9 +597,15 @@ void InventoryHandler::closeStorage()
 {
     if (mStorageWindow)
     {
+        mStorageWindow->unsetInventory();
         mStorageWindow->close();
         mStorageWindow = nullptr;
     }
 }
 
+void InventoryHandler::forgotStorage()
+{
+    mStorageWindow = nullptr;
+}
+
 }  // namespace Ea
-- 
cgit v1.2.3-70-g09d2