attempt to fix #4901

spring · Jul 12, 2015 · 98e7aff · 98e7aff
1 parent 6d10c5c
commit 98e7aff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/rts/Rendering/Env/Decals/GroundDecalHandler.cpp b/rts/Rendering/Env/Decals/GroundDecalHandler.cpp
@@ -37,7 +37,6 @@ using std::list;
 using std::min;
 using std::max;
 
-CGroundDecalHandler* groundDecals_ = NULL;
 
 CONFIG(int, GroundScarAlphaFade).defaultValue(0);
 
@@ -109,16 +108,16 @@ CGroundDecalHandler::~CGroundDecalHandler()
 		delete *ti;
 	}
 
-	for (std::vector<SolidObjectDecalType*>::iterator tti = objectDecalTypes.begin(); tti != objectDecalTypes.end(); ++tti) {
-		for (set<SolidObjectGroundDecal*>::iterator ti = (*tti)->objectDecals.begin(); ti != (*tti)->objectDecals.end(); ++ti) {
-			if ((*ti)->owner)
-				(*ti)->owner->groundDecal = 0;
-			if ((*ti)->gbOwner)
-				(*ti)->gbOwner->decal = 0;
-			delete *ti;
+	for (SolidObjectDecalType* dctype: objectDecalTypes) {
+		for (SolidObjectGroundDecal* dc: dctype->objectDecals) {
+			if (dc->owner)
+				dc->owner->groundDecal = nullptr;
+			if (dc->gbOwner)
+				dc->gbOwner->decal = nullptr;
+			delete dc;
 		}
-		glDeleteTextures (1, &(*tti)->texture);
-		delete *tti;
+		glDeleteTextures(1, &dctype->texture);
+		delete dctype;
 	}
 	for (std::list<Scar*>::iterator si = scars.begin(); si != scars.end(); ++si) {
 		delete *si;

diff --git a/rts/Rendering/Env/Decals/GroundDecalHandler.h b/rts/Rendering/Env/Decals/GroundDecalHandler.h
@@ -280,6 +280,4 @@ class CGroundDecalHandler: public IGroundDecalDrawer, public CEventClient, publi
 	void LoadScar(const std::string& file, unsigned char* buf, int xoffset, int yoffset);
 };
 
-extern CGroundDecalHandler* groundDecals_;
-
 #endif // GROUND_DECAL_HANDLER_H
diff --git a/rts/Rendering/Env/IGroundDecalDrawer.cpp b/rts/Rendering/Env/IGroundDecalDrawer.cpp
@@ -32,7 +32,7 @@ IGroundDecalDrawer* IGroundDecalDrawer::GetInstance()
 		} catch(const opengl_error& ex) {
 			LOG_L(L_ERROR, "IGroundDecalDrawer loading failed: %s", ex.what());
 #endif
-			delete singleton;
+			SafeDelete(singleton);
 			singleton = new CGroundDecalHandler();
 			LOG_L(L_INFO, "Loaded DecalsDrawer: %s", "Legacy");
 
@@ -47,6 +47,5 @@ IGroundDecalDrawer* IGroundDecalDrawer::GetInstance()
 
 void IGroundDecalDrawer::FreeInstance()
 {
-	delete singleton;
-	singleton = NULL;
+	SafeDelete(singleton);
 }