summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-12-05 21:09:49 +0300
committerAndrei Karas <akaras@inbox.ru>2012-12-05 21:09:49 +0300
commite39429ce4e219bd577f1adb2c98f04e614b57ceb (patch)
tree6ca7388440dd43d5a072916b28407fb58d250cbb
parentbef65b44075a5c918821f1360804ff5f9f2a32ed (diff)
downloadmanaplus-e39429ce4e219bd577f1adb2c98f04e614b57ceb.tar.gz
manaplus-e39429ce4e219bd577f1adb2c98f04e614b57ceb.tar.bz2
manaplus-e39429ce4e219bd577f1adb2c98f04e614b57ceb.tar.xz
manaplus-e39429ce4e219bd577f1adb2c98f04e614b57ceb.zip
Fix termination memory leaks after adding batch draw.
-rw-r--r--src/gui/equipmentwindow.cpp2
-rw-r--r--src/gui/widgets/shortcutcontainer.cpp6
-rw-r--r--src/gui/widgets/shortcutcontainer.h3
-rw-r--r--src/touchmanager.cpp2
4 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index ef22dc4c5..eec7bba4c 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -139,6 +139,8 @@ EquipmentWindow::~EquipmentWindow()
mSlotBackground->decRef();
if (mSlotHighlightedBackground)
mSlotHighlightedBackground->decRef();
+ delete mVertexes;
+ mVertexes = nullptr;
}
void EquipmentWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index c421a4bdb..eae6e3ff7 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -49,6 +49,12 @@ ShortcutContainer::ShortcutContainer() :
{
}
+ShortcutContainer::~ShortcutContainer()
+{
+ delete mVertexes;
+ mVertexes = nullptr;
+}
+
void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
{
mGridWidth = getWidth() / mBoxWidth;
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index b331782fb..999da22d5 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -53,8 +53,7 @@ class ShortcutContainer : public gcn::Widget,
/**
* Destructor.
*/
- ~ShortcutContainer()
- { }
+ ~ShortcutContainer();
/**
* Draws the shortcuts
diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp
index 3b8c6e21b..3a022afc3 100644
--- a/src/touchmanager.cpp
+++ b/src/touchmanager.cpp
@@ -48,6 +48,8 @@ TouchManager::TouchManager() :
TouchManager::~TouchManager()
{
clear();
+ delete mVertexes;
+ mVertexes = nullptr;
}
void TouchManager::init()