X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=f332cf68a97b1b2880324705a68acb7d22e82d87;hb=753e46f079f6cabdfd7da13acbde5ee62cf57111;hp=859ef08ee049837e60f7fbb33e0a43d97166bcef;hpb=904622ff2041870d9167235ccdafc4a991e2abe6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 859ef08..f332cf6 100755
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -410,23 +410,19 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
             // the property map contains only the custom shader
             else if( ( map->Count() == 1u )&&( shaderValue ) )
             {
-              Property::Map* shaderMap = shaderValue->GetMap();
-              if( shaderMap )
+              impl.mShaderMap = *( shaderValue->GetMap() );
+
+              if( !impl.mUrl.empty() )
+              {
+                impl.SetImage( impl.mUrl, impl.mImageSize );
+              }
+              else if( impl.mImage )
+              {
+                impl.SetImage( impl.mImage );
+              }
+              else if( !impl.mPropertyMap.Empty() )
               {
-                impl.mShaderMap = *shaderMap;
-
-                if( !impl.mUrl.empty() )
-                {
-                  impl.SetImage( impl.mUrl, impl.mImageSize );
-                }
-                else if( impl.mImage )
-                {
-                  impl.SetImage( impl.mImage );
-                }
-                else if( !impl.mPropertyMap.Empty() )
-                {
-                  impl.SetImage( impl.mPropertyMap );
-                }
+                impl.SetImage( impl.mPropertyMap );
               }
             }
           }