From 6dd9b4b96fbc4e24a206a99edfea1156d32ae608 Mon Sep 17 00:00:00 2001
From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Tue, 29 Apr 2014 12:11:44 +0100
Subject: [PATCH] Fix for slider

[Issue#] (N/A)

[Problem] Crash when changing properies from script

[Cause]

[Solution]

Change-Id: Ic94b7906fa3321a80efb8a8ef43f4a11e7276a71
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
---
 dali-toolkit/internal/controls/slider/slider-impl.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp
index e90c694..37650e4 100755
--- a/dali-toolkit/internal/controls/slider/slider-impl.cpp
+++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp
@@ -545,8 +545,11 @@ void Slider::CreateHandleValueDisplay()
 
 void Slider::DestroyHandleValueDisplay()
 {
-  mHandleValueTextView.Unparent();
-  mHandleValueTextView.Reset();
+  if(mHandleValueTextView)
+  {
+    mHandleValueTextView.Unparent();
+    mHandleValueTextView.Reset();
+  }
 }
 
 void Slider::UpdatePopupTextColor( const Vector4& color )
-- 
2.7.4