[AT-SPI] Make Accessible::GetName() fall back to actor name

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / control / control-data-impl.cpp

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index 3914e6a..4d7c6e4 100755 (executable)
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -1907,12 +1907,15 @@ std::string Control::Impl::AccessibleImpl::GetName()
   if (controlImpl.mAccessibilityNameSet)
     return controlImpl.mAccessibilityName;
 
-  return GetNameRaw();
+  if (auto raw = GetNameRaw(); !raw.empty())
+    return raw;
+
+  return self.GetProperty< std::string >( Actor::Property::NAME );
 }
 
 std::string Control::Impl::AccessibleImpl::GetNameRaw()
 {
-  return self.GetProperty< std::string >( Actor::Property::NAME );
+  return {};
 }
 
 std::string Control::Impl::AccessibleImpl::GetDescription()