From b69e0973599907a9b1021c6859cb1d668fe9debb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 May 2011 01:04:35 +0300
Subject: Fix memory leak in resourcemanager.

---
 src/resources/resourcemanager.cpp | 10 ++++++----
 src/resources/resourcemanager.h   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 5552b64b1..54c7a22e4 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -47,16 +47,18 @@
 
 ResourceManager *ResourceManager::instance = NULL;
 
-ResourceManager::ResourceManager()
-  : mOldestOrphan(0),
+ResourceManager::ResourceManager() :
+    mOldestOrphan(0),
     mSelectedSkin(""),
-    mSkinName("")
+    mSkinName(""),
+    mDestruction(0)
 {
     logger->log1("Initializing resource manager...");
 }
 
 ResourceManager::~ResourceManager()
 {
+    mDestruction = true;
     mResources.insert(mOrphanedResources.begin(), mOrphanedResources.end());
 
     // Release any remaining spritedefs first because they depend on image sets
@@ -526,7 +528,7 @@ SpriteDef *ResourceManager::getSprite(const std::string &path, int variant)
 
 void ResourceManager::release(Resource *res)
 {
-    if (!res)
+    if (!res || mDestruction)
         return;
 
     ResourceIterator resIter = mResources.find(res->mIdPath);
diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager.h
index 16ded5ab2..8d1070463 100644
--- a/src/resources/resourcemanager.h
+++ b/src/resources/resourcemanager.h
@@ -263,6 +263,7 @@ class ResourceManager
         time_t mOldestOrphan;
         std::string mSelectedSkin;
         std::string mSkinName;
+        bool mDestruction;
 };
 
 #endif
-- 
cgit v1.2.3-60-g2f50


From d4beb6fec5eefa60a2d2f873feabaf84731bd50b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 27 May 2011 01:17:04 +0300
Subject: Fix memory leak in graphicsvertexes in SDL mode.

---
 src/graphicsvertexes.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/graphicsvertexes.cpp b/src/graphicsvertexes.cpp
index 0cadfedc2..d5b374db9 100644
--- a/src/graphicsvertexes.cpp
+++ b/src/graphicsvertexes.cpp
@@ -132,6 +132,7 @@ void GraphicsVertexes::init(int x, int y, int w, int h)
     mH = h;
     for (int f = 0; f < 10; f ++)
     {
+        delete_all(sdl[mPtr].mList);
         sdl[mPtr].mList.clear();
 #ifdef USE_OPENGL
         ogl[mPtr].init();
@@ -156,6 +157,7 @@ void GraphicsVertexes::pushSDL(SDL_Rect r1, SDL_Rect r2)
 
 void GraphicsVertexes::clearSDL()
 {
+    delete_all(sdl[mPtr].mList);
     sdl[mPtr].mList.clear();
 }
 
-- 
cgit v1.2.3-60-g2f50