diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-04-26 20:30:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-04-26 20:30:22 +0300 |
| commit | 6b06a89665fdfa9ecc7179bae827cefae3cb1a77 (patch) | |
| tree | d90008a75b6d3d883591ccce196b43c94c3cd67c /src/gui/widgets | |
| parent | bcdf34645ff3067d3b4110120b6191af2b0b2e99 (diff) | |
| parent | 2ee2f8b060e4fe88feeeba5508189c916e55a70d (diff) | |
| download | manaverse-stable.tar.gz manaverse-stable.tar.bz2 manaverse-stable.tar.xz manaverse-stable.zip | |
Merge branch 'master' into stablestable
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 { |