diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-04-22 21:54:59 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-04-22 21:54:59 +0300 |
| commit | bcd95847a435bb3aab90bdb3c2fdada6063efc2e (patch) | |
| tree | 9a9cb19d2cec9c73d3b8c9eaeb4c781b0ac48642 /src/net/ea/inventoryhandler.cpp | |
| parent | ff6c93b16f408a2ef10e47a4168c59ab6c4fdafb (diff) | |
| download | mv-bcd95847a435bb3aab90bdb3c2fdada6063efc2e.tar.gz mv-bcd95847a435bb3aab90bdb3c2fdada6063efc2e.tar.bz2 mv-bcd95847a435bb3aab90bdb3c2fdada6063efc2e.tar.xz mv-bcd95847a435bb3aab90bdb3c2fdada6063efc2e.zip | |
Fix crash if start trade with opened storage.
Diffstat (limited to 'src/net/ea/inventoryhandler.cpp')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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 |