summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-15 20:04:28 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-15 20:04:28 +0300
commitb8534818a594b6b846e37f7407e68e722a9b155b (patch)
treef4b1bf8ee2b534fa7e50517b6a0c84c446318c77 /src/gui/windows
parent89c361475ff1648c38c3c30f8112727b63fb40d6 (diff)
downloadmanaplus-b8534818a594b6b846e37f7407e68e722a9b155b.tar.gz
manaplus-b8534818a594b6b846e37f7407e68e722a9b155b.tar.bz2
manaplus-b8534818a594b6b846e37f7407e68e722a9b155b.tar.xz
manaplus-b8534818a594b6b846e37f7407e68e722a9b155b.zip
Fix drop/store window in inventory.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/inventorywindow.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 9877bd147..5b236df21 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -415,7 +415,7 @@ void InventoryWindow::action(const ActionEvent &event)
this, item);
}
#ifdef EATHENA_SUPPORT
- else if (cartWindow)
+ else if (cartWindow && cartWindow->isWindowVisible())
{
ItemAmountWindow::showWindow(ItemAmountWindow::CartAdd,
this, item);
@@ -462,7 +462,7 @@ void InventoryWindow::action(const ActionEvent &event)
InventoryType::STORAGE);
}
#ifdef EATHENA_SUPPORT
- else if (cartWindow)
+ else if (cartWindow && cartWindow->isWindowVisible())
{
inventoryHandler->moveItem2(InventoryType::INVENTORY,
item->getInvIndex(), item->getQuantity(),
@@ -499,7 +499,7 @@ void InventoryWindow::action(const ActionEvent &event)
this, item);
}
#ifdef EATHENA_SUPPORT
- else if (cartWindow)
+ else if (cartWindow && cartWindow->isWindowVisible())
{
ItemAmountWindow::showWindow(ItemAmountWindow::CartRemove,
this, item);
@@ -851,7 +851,7 @@ void InventoryWindow::updateDropButton()
return;
#ifdef EATHENA_SUPPORT
- if (isStorageActive() || cartWindow)
+ if (isStorageActive() || (cartWindow && cartWindow->isWindowVisible()))
#else
if (isStorageActive())
#endif