From a3a8136e686523d5f0f01a3925d4bb3bb97bbbb9 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 25 Apr 2022 11:34:57 +0900 Subject: [PATCH] [Tizen] Don't use pre-initialized app in case of WidgetApplication Change-Id: I80c4ef6b89191471aa73f99d1b1a731f41fb7add --- dali/public-api/adaptor-framework/widget-application.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dali/public-api/adaptor-framework/widget-application.cpp b/dali/public-api/adaptor-framework/widget-application.cpp index 05444c0..d7bc085 100644 --- a/dali/public-api/adaptor-framework/widget-application.cpp +++ b/dali/public-api/adaptor-framework/widget-application.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,13 @@ namespace Dali { WidgetApplication WidgetApplication::New(int* argc, char** argv[], const std::string& stylesheet) { + Internal::Adaptor::ApplicationPtr preInitializedApplication = Internal::Adaptor::Application::GetPreInitializedApplication(); + if(preInitializedApplication) + { + // WidgetApplication can't use pre-initialized application. So reset it. + preInitializedApplication.Reset(); + } + Internal::Adaptor::WidgetApplicationPtr internal = Internal::Adaptor::WidgetApplication::New(argc, argv, stylesheet); return WidgetApplication(internal.Get()); } -- 2.7.4