Merge "Fix SVACE issue" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 8 Oct 2018 09:52:04 +0000 (09:52 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 8 Oct 2018 09:52:04 +0000 (09:52 +0000)
dali-toolkit/internal/controls/image-view/image-view-impl.cpp

index 5e520d8..890312c 100755 (executable)
@@ -394,19 +394,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 );
+                }
               }
             }
           }