summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-03-25 19:31:42 -0400
committerChuck Miller <shadowmil@gmail.com>2010-03-25 19:33:09 -0400
commitb9484310e0196528fb3fa91591a0b33127c4247a (patch)
tree9b0dd5dafcb9125cc672da5cebb3ffea5cdd286a /src
parent58c39fb8449526e8334c41fc48abdeedde39ca62 (diff)
downloadmana-b9484310e0196528fb3fa91591a0b33127c4247a.tar.gz
mana-b9484310e0196528fb3fa91591a0b33127c4247a.tar.bz2
mana-b9484310e0196528fb3fa91591a0b33127c4247a.tar.xz
mana-b9484310e0196528fb3fa91591a0b33127c4247a.zip
Fix the close button on the inventory window
Reviewed-by: Jared Adams
Diffstat (limited to 'src')
-rw-r--r--src/gui/inventorywindow.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index bb6f021e..f214fde5 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -331,11 +331,14 @@ void InventoryWindow::setSplitAllowed(bool allowed)
void InventoryWindow::close()
{
if (this == inventoryWindow)
- return;
-
- Net::getInventoryHandler()->closeStorage(Inventory::STORAGE);
-
- scheduleDelete();
+ {
+ setVisible(false);
+ }
+ else
+ {
+ Net::getInventoryHandler()->closeStorage(Inventory::STORAGE);
+ scheduleDelete();
+ }
}
void InventoryWindow::updateWeight()