summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-07-03 20:00:46 +0300
committerAndrei Karas <akaras@inbox.ru>2013-07-03 20:00:46 +0300
commita1bd0179b28fa93c771bc5602f64746878f0ffad (patch)
treeff696a9b98c32441b06ffabf2a8ca7312590c8e3 /src/gui
parent41953ac4902ca11bb07b0aab53e811ca68ce4f64 (diff)
downloadmanaverse-a1bd0179b28fa93c771bc5602f64746878f0ffad.tar.gz
manaverse-a1bd0179b28fa93c771bc5602f64746878f0ffad.tar.bz2
manaverse-a1bd0179b28fa93c771bc5602f64746878f0ffad.tar.xz
manaverse-a1bd0179b28fa93c771bc5602f64746878f0ffad.zip
fix some leaks on exit.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/inventorywindow.cpp2
-rw-r--r--src/gui/widgets/dropdown.cpp5
-rw-r--r--src/gui/widgets/dropdown.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 323830e33..a9a096d73 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -275,7 +275,7 @@ InventoryWindow::~InventoryWindow()
if (!invInstances.empty())
invInstances.front()->updateDropButton();
- mSortDropDown->hideDrop();
+ mSortDropDown->hideDrop(false);
delete mSortModel;
mSortModel = nullptr;
//delete mTextPopup;
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 4ebbcc001..e8d4006a2 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -355,9 +355,10 @@ void DropDown::keyPressed(gcn::KeyEvent& keyEvent)
keyEvent.consume();
}
-void DropDown::hideDrop()
+void DropDown::hideDrop(bool event)
{
- distributeActionEvent();
+ if (event)
+ distributeActionEvent();
mPopup->setVisible(false);
}
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index da0251260..58b01b288 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -118,7 +118,7 @@ class DropDown final : public gcn::ActionListener,
void foldUp();
- void hideDrop();
+ void hideDrop(bool event = true);
int getSelected() const;