Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / control-impl.cpp

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index e7a90a1..52e9764 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -597,7 +597,11 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper
     }
     case Actor::Property::VISIBLE:
     {
-      GetAccessibleObject()->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      auto* accessible = GetAccessibleObject();
+      if(DALI_LIKELY(accessible))
+      {
+        accessible->EmitVisible(Self().GetProperty<bool>(Actor::Property::VISIBLE));
+      }
       break;
     }
     case DevelActor::Property::USER_INTERACTION_ENABLED: