X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-scroller.cpp;h=ed3b0c006152f10723a18b6135d157479bb750c9;hp=4ca011e9664f35cc6cad4015cf10bbc96f061acd;hb=8b8dce7461bc5cec89a47d60b2a72880bfb13514;hpb=fa6b6fd95e2916fd7f6ed2f016da51a0994440b5

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index 4ca011e..ed3b0c0 100644
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -274,7 +274,11 @@ void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T
 
     // Reset to the original shader and texture before scrolling
     mRenderer.SetShader(mShader);
-    mRenderer.SetTextures( mTextureSet );
+
+    if( mTextureSet )
+    {
+      mRenderer.SetTextures( mTextureSet );
+    }
   }
 
   mShader = mRenderer.GetShader();