X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=dcc997b36178943b305541755ae8012bb649ffbc;hb=3ad20543558830da2b46ec83e3be4f8daf77add0;hp=2c8183c41cc28a4c2b399b413da75c741dc4b765;hpb=87a9019904ab49c42f1e32e7ebb6a1512b0dc28c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 2c8183c..dcc997b 100644
--- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -1,5 +1,5 @@
  /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -281,11 +281,15 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
                  Scripting::GetEnumerationName<Toolkit::DevelVisual::Type>( visualType,
                                                                             VISUAL_TYPE_TABLE,
                                                                             VISUAL_TYPE_TABLE_COUNT ),
-                 visualType==Toolkit::DevelVisual::IMAGE?"url:":"",
-                 visualType==Toolkit::DevelVisual::IMAGE ?
-                 propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME)->Get<std::string>().c_str()
-                 :"" );
-
+                 ( visualType == Toolkit::DevelVisual::IMAGE ) ? "url:" : "",
+                 ( visualType == Toolkit::DevelVisual::IMAGE ) ?
+                             ( ([&] (){
+                                        // Return URL if present in PropertyMap else return "not found message"
+                                        Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+                                        return ( imageURLValue ) ? imageURLValue->Get<std::string>().c_str() : "url not found in PropertyMap";
+                                      })()
+                             )
+                             : "" );
 
   if( !visualPtr )
   {