From eaf1c24cdc97efeb703ab0b9eb8831d52b2653e9 Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Fri, 22 May 2015 15:21:39 +0300
Subject: [PATCH] Do not call abandon texture if there is no texture

Check if the texture was created before abandoning on SpriteAtlas
destructor. Linux driver was fine with that, but was crashing on Mac.
---
 src/mbgl/geometry/sprite_atlas.cpp | 6 ++++--
 test/resources/resource_loader.cpp | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mbgl/geometry/sprite_atlas.cpp b/src/mbgl/geometry/sprite_atlas.cpp
index 4e05c94ad..30624e2d1 100644
--- a/src/mbgl/geometry/sprite_atlas.cpp
+++ b/src/mbgl/geometry/sprite_atlas.cpp
@@ -299,6 +299,8 @@ void SpriteAtlas::bind(bool linear) {
 
 SpriteAtlas::~SpriteAtlas() {
     std::lock_guard<std::recursive_mutex> lock(mtx);
-    Environment::Get().abandonTexture(texture);
-    texture = 0;
+    if (texture) {
+        Environment::Get().abandonTexture(texture);
+        texture = 0;
+    }
 }
diff --git a/test/resources/resource_loader.cpp b/test/resources/resource_loader.cpp
index 4203755f8..52209e887 100644
--- a/test/resources/resource_loader.cpp
+++ b/test/resources/resource_loader.cpp
@@ -59,8 +59,6 @@ public:
         spriteAtlas_.reset();
         glyphAtlas_.reset();
         glyphStore_.reset();
-
-        env_.performCleanup();
     }
 
     void update() {