From: tscholb Date: Wed, 25 Jan 2023 02:00:05 +0000 (+0900) Subject: Call widget_instance_terminate_app() when widget is not created X-Git-Tag: submit/tizen_6.0/20230125.025939^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db1a38b4bcffd58e4b5eaadf420a1af9c4fa8810;p=platform%2Fcore%2Fuifw%2Fwidget-viewer-dali.git Call widget_instance_terminate_app() when widget is not created Change-Id: I1e2a5a931cd7e23e01ef167b0801e501df21469d --- 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 63798e6..7172412 100644 --- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp +++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp @@ -664,11 +664,23 @@ bool WidgetView::TerminateWidget() { int ret = 0; - // Destroy widget instance because it will be not used anymore. - ret = widget_instance_destroy( mInstanceId.c_str() ); - if( ret < 0 ) + if( !mCreated ) + { + // If it is not created, it skips creation. + ret = widget_instance_terminate_app( mInstanceId.c_str() ); + if( ret < 0 ) + { + DALI_LOG_ERROR("widget_instance_terminate_app() is failed. ret:%d, id:%s \n",ret, mInstanceId.c_str()); + } + } + else { - DALI_LOG_ERROR("widget_instance_destroy() is failed. ret:%d, id:%s \n",ret, mInstanceId.c_str()); + // Destroy widget instance because it will be not used anymore. + ret = widget_instance_destroy( mInstanceId.c_str() ); + if( ret < 0 ) + { + DALI_LOG_ERROR("widget_instance_destroy() is failed. ret:%d, id:%s \n",ret, mInstanceId.c_str()); + } } aul_widget_instance_del(mWidgetId.c_str(), mInstanceId.c_str());