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

Change-Id: I1016e01c354060a81fd0755fb3e167a5cbc3b7f4

diff --git a/dali-csharp-binder/common/nui-view-accessible.cpp b/dali-csharp-binder/common/nui-view-accessible.cpp
index 49d5521..f9f1970 100644 (file)
--- a/dali-csharp-binder/common/nui-view-accessible.cpp
+++ b/dali-csharp-binder/common/nui-view-accessible.cpp
@@ -750,6 +750,9 @@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Accessibility_DetachAccessibleObject(Dal
         if(viewAccessible)
         {
           viewAccessible->Detach();
+
+          // In case someone forgot View.UnregisterDefaultLabel() before View.Dispose()...
+          Dali::Accessibility::Bridge::GetCurrentBridge()->UnregisterDefaultLabel(viewAccessible);
         }
       }
 

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 8333f35..0b41bb1 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.16
+Version: 2.3.17
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT