From 8a6d909b22622d89c8a86fd23d329ba136bb76d7 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 9 Mar 2017 19:28:02 +0100
Subject: [PATCH] Fix composite map being compiled twice

---
 components/terrain/compositemaprenderer.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp
index 21d017623..2b7a33686 100644
--- a/components/terrain/compositemaprenderer.cpp
+++ b/components/terrain/compositemaprenderer.cpp
@@ -121,8 +121,14 @@ void CompositeMapRenderer::addCompositeMap(CompositeMap* compositeMap, bool imme
 void CompositeMapRenderer::setImmediate(CompositeMap* compositeMap)
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
-    mImmediateCompileSet.insert(compositeMap);
-    mCompileSet.erase(compositeMap);
+    CompileSet::iterator found = mCompileSet.find(compositeMap);
+    if (found == mCompileSet.end())
+        return;
+    else
+    {
+        mImmediateCompileSet.insert(compositeMap);
+        mCompileSet.erase(found);
+    }
 }
 
 CompositeMap::~CompositeMap()