Merge "Fix for lock up on Text Shadow ( not clearing up rendertask correctly )" into...

diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index 3d8efde..a5ea934 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -420,6 +420,10 @@ struct AtlasRenderer::Impl : public ConnectionTracker
 
   void RenderComplete( RenderTask& renderTask )
   {
+    // Disconnect and remove this single shot render task
+    renderTask.FinishedSignal().Disconnect( this, &AtlasRenderer::Impl::RenderComplete );
+    Stage::GetCurrent().GetRenderTaskList().RemoveTask( renderTask );
+
     // Get the actor used for render to buffer and remove it from the parent
     Actor renderActor = renderTask.GetSourceActor();
     if ( renderActor )