X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=b696a5255c38f223a31553bbd936424333c8fe9e;hb=refs%2Fchanges%2F48%2F245348%2F9;hp=1f5510d4d64e070130234fbb22744c768c36301c;hpb=e3d6a0a27fd980a4ced6e7257abdc32bc192e871;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 1f5510d..b696a52 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -1316,16 +1316,20 @@ Padding Button::GetForegroundPadding()
 
 std::string Button::AccessibleImpl::GetNameRaw()
 {
+  std::string labelText;
   auto slf = Toolkit::Button::DownCast( self );
+  Property::Map labelMap = slf.GetProperty<Property::Map>( Toolkit::Button::Property::LABEL );
 
-  Property::Map label = slf.GetProperty<Property::Map>( Toolkit::Button::Property::LABEL );
-
-  std::string labelText;
-  label.Find( Toolkit::TextVisual::Property::TEXT )->Get( labelText );
+  Property::Value* textPropertyPtr = labelMap.Find( Toolkit::TextVisual::Property::TEXT );
+  if ( textPropertyPtr )
+  {
+    textPropertyPtr->Get( labelText );
+  }
 
   return labelText;
 }
 
+
 Property::Index Button::AccessibleImpl::GetNamePropertyIndex()
 {
   Property::Index label = Toolkit::Button::Property::LABEL;