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" );
}
}
case WIDGET_INSTANCE_EVENT_FAULT:
{
- mPid = -1;
ShowRetryState( true );
mWidgetFaultedSignal.Emit( handle );
+ CloseRemoteSurface();
+ RemoveWidgetImage();
break;
}
default:
{
screen_connector_toolkit_remove( mWatcherHandle );
mWatcherHandle = NULL;
+ mRemoteSurface = NULL;
+ mPid = -1;
}
- mRemoteSurface = NULL;
- mPid = -1;
}
void WidgetView::ShowLoadingState( bool show )