From 2988a00406d5c3904464e1767f7ee122d705378b Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 3 May 2022 19:49:03 +0900 Subject: [PATCH] Add nullptr check of EcoreHandler Before calling methods of EcoreHandler, the AppCoreMultiWindowBase should check whether the handler is nullptr or not. Change-Id: I3a52492d3ecefef46ae5ecc7bb4ffd6bc06fb3c0 Signed-off-by: Hwankyu Jhun --- tizen-cpp/app-core-multi-window-cpp/app_core_multi_window_base.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tizen-cpp/app-core-multi-window-cpp/app_core_multi_window_base.cc b/tizen-cpp/app-core-multi-window-cpp/app_core_multi_window_base.cc index 6f3e89c..86261da 100644 --- a/tizen-cpp/app-core-multi-window-cpp/app_core_multi_window_base.cc +++ b/tizen-cpp/app-core-multi-window-cpp/app_core_multi_window_base.cc @@ -219,9 +219,12 @@ void AppCoreMultiWindowBase::Dispose() { } impl_->contexts_.clear(); impl_->factory_map_.clear(); - impl_->handler_->UnsetEvents(); + AppCoreBase::Dispose(); - impl_->handler_->Fini(); + if (impl_->handler_.get() != nullptr) { + impl_->handler_->UnsetEvents(); + impl_->handler_->Fini(); + } } int AppCoreMultiWindowBase::OnCreate() { -- 2.7.4