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/gui/widgets | |
| 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/gui/widgets')
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index ee2e35920..f24be7737 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -507,7 +507,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) Net::getInventoryHandler()->moveItem(mSelectedIndex, index); selectNone(); } - else + else if (mInventory) { const DragDropSource src = dragDrop.getSource(); DragDropSource dst = DRAGDROP_SOURCE_EMPTY; diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index f7bc44849..06e9fd459 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -131,6 +131,9 @@ class ItemContainer final : public Widget, bool getClickCount() const A_WARN_UNUSED { return mClicks; } + void unsetInventory() + { mInventory = nullptr; } + private: enum Direction { |