[dali_2.3.16] Merge branch 'devel/master'

Change-Id: Ib110b4b486933e98071685ef790a368a491ef6df

diff --git a/dali-csharp-binder/common/processor-controller.cpp b/dali-csharp-binder/common/processor-controller.cpp
index 90b7c03..d4ef851 100644 (file)
--- a/dali-csharp-binder/common/processor-controller.cpp
+++ b/dali-csharp-binder/common/processor-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -44,7 +44,7 @@ ProcessorController::~ProcessorController()
   {
     try
     {
-      if(mProcessRegistered)
+      if(mProcessRegistered && Dali::Adaptor::IsAvailable())
       {
         Dali::Adaptor::Get().UnregisterProcessor(*this);
         Dali::Adaptor::Get().UnregisterProcessor(*this, true);

diff --git a/dali-csharp-binder/dali-adaptor/application-wrap.cpp b/dali-csharp-binder/dali-adaptor/application-wrap.cpp
index 4b444e4..8addc5f 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/application-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/application-wrap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -521,6 +521,7 @@ SWIGEXPORT unsigned int SWIGSTDCALL CSharp_Dali_Application_GetWindowsListSize()
   {
     try
     {
+      // Note : We should not check Dali::Adaptor::IsAvailable() here. Since this API could be called at OnTerminate time.
       result  = Dali::Adaptor::Get().GetWindows();
       jresult = result.size();
     }
@@ -538,6 +539,7 @@ SWIGEXPORT void* SWIGSTDCALL CSharp_Dali_Application_GetWindowsFromList(unsigned
   {
     try
     {
+      // Note : We should not check Dali::Adaptor::IsAvailable() here. Since this API could be called at OnTerminate time.
       result = Dali::Adaptor::Get().GetWindows();
     }
     CALL_CATCH_EXCEPTION(0);

diff --git a/dali-csharp-binder/dali-adaptor/window-wrap.cpp b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
index 98543cd..3ac0a2d 100644 (file)
--- a/dali-csharp-binder/dali-adaptor/window-wrap.cpp
+++ b/dali-csharp-binder/dali-adaptor/window-wrap.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -1564,7 +1564,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_FeedKey_Default_Window(void * eve
   }
   {
     try {
-      Dali::Adaptor::Get().FeedKeyEvent(*keyEvent);
+      if(Dali::Adaptor::IsAvailable())
+      {
+        Dali::Adaptor::Get().FeedKeyEvent(*keyEvent);
+      }
     } CALL_CATCH_EXCEPTION();
   }
 }
@@ -1651,7 +1654,10 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_FeedHover(void * window, void * t
 
 SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Adaptor_RenderOnce(void * /* jarg1 */) {
   try {
-    Dali::Adaptor::Get().RenderOnce();
+    if(Dali::Adaptor::IsAvailable())
+    {
+      Dali::Adaptor::Get().RenderOnce();
+    }
   } CALL_CATCH_EXCEPTION();
 }
 

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 98e5a3b..8333f35 100644 (file)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali2-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 2.3.15
+Version: 2.3.16
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT