From 8b62b835859fe0680ef11583e31907c725f47dc1 Mon Sep 17 00:00:00 2001
From: "taeyoon0.lee" <taeyoon0.lee@samsung.com>
Date: Mon, 6 Mar 2017 19:24:52 +0900
Subject: [PATCH] Modified internal api for fault widget case

  - Modified work of missing callback and fault widget event callback

Change-Id: I6b502bc5301dbdb3ab1b2923345622cee10af281
---
 internal/widget_view/widget_view_impl.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/internal/widget_view/widget_view_impl.cpp b/internal/widget_view/widget_view_impl.cpp
index f4fa403..071838d 100644
--- a/internal/widget_view/widget_view_impl.cpp
+++ b/internal/widget_view/widget_view_impl.cpp
@@ -457,11 +457,14 @@ void WidgetView::CreateWidgetImageView()
 
 void WidgetView::RemoveWidgetImage()
 {
-  mWidgetImageView.SetVisible( false );
-  mWidgetImageView.Reset();
+  if( mWidgetImageView )
+  {
+    mWidgetImageView.SetVisible( false );
+    mWidgetImageView.Reset();
 
-  Dali::WidgetView::WidgetView handle( GetOwner() );
-  mWidgetDeletedSignal.Emit( handle );
+    Dali::WidgetView::WidgetView handle( GetOwner() );
+    mWidgetDeletedSignal.Emit( handle );
+  }
 
   DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::RemoveWidgetImage: Widget image is removed.\n" );
 }
@@ -513,9 +516,10 @@ void WidgetView::SendWidgetEvent( int event )
     }
     case WIDGET_INSTANCE_EVENT_FAULT:
     {
-      mPid = -1;
       ShowRetryState( true );
       mWidgetFaultedSignal.Emit( handle );
+      CloseRemoteSurface();
+      RemoveWidgetImage();
       break;
     }
     default:
@@ -1062,9 +1066,9 @@ void WidgetView::CloseRemoteSurface()
   {
     screen_connector_toolkit_remove( mWatcherHandle );
     mWatcherHandle = NULL;
+    mRemoteSurface = NULL;
+    mPid = -1;
   }
-  mRemoteSurface = NULL;
-  mPid = -1;
 }
 
 void WidgetView::ShowLoadingState( bool show )
-- 
2.34.1