Fixed crash by wrong default image path

Change-Id: Iee0818f25b6db93509300035c8d9c730161b939f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e08e64..2e2d454 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
 SET(LOCAL_PUBLIC_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/public_api)
 SET(IMAGE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/images")
+ADD_DEFINITIONS("-DWIDGET_VIEW_RESOURCE_DEFAULT_IMG=\"${IMAGE_DIR}/unknown.png\"")
 
 ADD_DEFINITIONS("-DPKGNAME=\"${PROJECT_NAME}\"")
 

diff --git a/internal/widget_view/widget_view_impl.cpp b/internal/widget_view/widget_view_impl.cpp
index b14fb19..5e88409 100644 (file)
--- a/internal/widget_view/widget_view_impl.cpp
+++ b/internal/widget_view/widget_view_impl.cpp
@@ -50,8 +50,6 @@ namespace Internal
 namespace
 {
 
-#define WIDGET_VIEW_RESOURCE_DEFAULT_IMG "/widget_viewer_dali/images/unknown.png"
-
 #if defined(DEBUG_ENABLED)
 Integration::Log::Filter* gWidgetViewLogging  = Integration::Log::Filter::New( Debug::Verbose, false, "LOG_WIDGET_VIEW" );
 #endif
@@ -706,8 +704,7 @@ void WidgetView::OnInitialize()
   }
   else
   {
-    previewImage = tzplatform_getenv( TZ_SYS_SHARE );
-    previewImage.append( WIDGET_VIEW_RESOURCE_DEFAULT_IMG );
+    previewImage = WIDGET_VIEW_RESOURCE_DEFAULT_IMG;
   }
 
   DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::OnInitialize: preview image path = %s\n", previewImage.c_str() );