X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.cpp;h=4e7dff927eb5bfc9f6b7365b8b5f7b53102abbc0;hp=df01b275d51313e5b8371aab4f08cd61a6181dd5;hb=bff20519386ec96b48addb2ebce43e491164b54f;hpb=1fe6286be11679b2f5c14a60636ae9cb486570e4

diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index df01b27..4e7dff9 100755
--- a/dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp
@@ -459,6 +459,16 @@ Control::Impl::Impl( Control& controlImpl )
 
 Control::Impl::~Impl()
 {
+  for( auto&& iter : mVisuals )
+  {
+    StopObservingVisual( iter->visual );
+  }
+
+  for( auto&& iter : mRemoveVisuals )
+  {
+    StopObservingVisual( iter->visual );
+  }
+
   AccessibilityDeregister();
   // All gesture detectors will be destroyed so no need to disconnect.
   delete mStartingPinchScale;
@@ -1207,13 +1217,21 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES:
       {
-        value.Get( controlImpl.mImpl->mAccessibilityAttributes );
+        const Property::Map* map = value.GetMap();
+        if( map && !map->Empty() )
+        {
+          controlImpl.mImpl->mAccessibilityAttributes = *map;
+        }
         break;
       }
 
       case Toolkit::DevelControl::Property::ACCESSIBILITY_ANIMATED:
       {
-        value.Get( controlImpl.mImpl->mAccessibilityAnimated );
+        bool animated;
+        if( value.Get( animated ) )
+        {
+          controlImpl.mImpl->mAccessibilityAnimated = animated;
+        }
         break;
       }
     }