From d13ef7a31fdd0bcc9aa0d334964afbfd57bd2217 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 4 Aug 2017 19:45:26 +0900 Subject: [PATCH] Fix the exception handling about permanent deletion Change-Id: I11aef3cf2118306d35ac8c7d6d809b367fd55d32 Signed-off-by: Hwankyu Jhun --- .../internal/widget_view/widget_view_impl.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp index 47d11ded..1b69ef0b 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -483,12 +483,14 @@ void WidgetView::TerminateWidget() { if( !mWidgetId.empty() && !mInstanceId.empty() ) { - widget_instance_terminate( mInstanceId.c_str() ); - if( mPermanentDelete ) { widget_instance_destroy( mInstanceId.c_str() ); } + else + { + widget_instance_terminate( mInstanceId.c_str() ); + } Dali::WidgetView::WidgetView handle( GetOwner() ); mWidgetTerminatedSignal.Emit( handle ); -- 2.34.1