[Tizen] Fix SVACE issue 78/190578/1 accepted/tizen/unified/20181005.012307 submit/tizen/20181004.100218 submit/tizen/20181004.103602
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 4 Oct 2018 02:56:47 +0000 (11:56 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Thu, 4 Oct 2018 03:06:49 +0000 (12:06 +0900)
Change-Id: I1d5394c68604eef38d808f01a7fd1167a1509711

dali-toolkit/internal/controls/image-view/image-view-impl.cpp

index f332cf6..859ef08 100755 (executable)
@@ -410,19 +410,23 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
             // the property map contains only the custom shader
             else if( ( map->Count() == 1u )&&( shaderValue ) )
             {
-              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() )
+              Property::Map* shaderMap = shaderValue->GetMap();
+              if( shaderMap )
               {
-                impl.SetImage( impl.mPropertyMap );
+                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 );
+                }
               }
             }
           }