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=0e3af00701c3e1a4bff6cfc5533a90bb0d9a084d;hp=2710d3a4b66b49ed68e76c494fd1b7989e33461b;hb=fa04b45ad02ba0f85c8030387774d83a2cd5882b;hpb=870be8fd487bf510428d83838f3786efe7d3316e

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index 2710d3a..0e3af00 100644
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -282,7 +282,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();