Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / events / long-press-gesture-processor.cpp

diff --git a/dali/internal/event/events/long-press-gesture-processor.cpp b/dali/internal/event/events/long-press-gesture-processor.cpp
index 6fc846a..d2d2e2e 100644 (file)
--- a/dali/internal/event/events/long-press-gesture-processor.cpp
+++ b/dali/internal/event/events/long-press-gesture-processor.cpp
@@ -201,12 +201,15 @@ void LongPressGestureProcessor::Process( const Integration::LongPressGestureEven
     }
 
     case Gesture::Continuing:
-      DALI_ASSERT_ALWAYS( false && "Incorrect state received from Integration layer: Continuing\n" );
+    {
+      DALI_ABORT( "Incorrect state received from Integration layer: Continuing\n" );
       break;
-
+    }
     case Gesture::Clear:
-      DALI_ASSERT_ALWAYS( false && "Incorrect state received from Integration layer: Clear\n" );
+    {
+      DALI_ABORT( "Incorrect state received from Integration layer: Clear\n" );
       break;
+    }
   }
 }
 
@@ -270,16 +273,19 @@ void LongPressGestureProcessor::UpdateDetection()
   {
     LongPressGestureDetector* current(*iter);
 
-    unsigned int minimum = current->GetMinimumTouchesRequired();
-    if (minimum < minimumRequired)
+    if( current )
     {
-      minimumRequired = minimum;
-    }
+      unsigned int minimum = current->GetMinimumTouchesRequired();
+      if (minimum < minimumRequired)
+      {
+        minimumRequired = minimum;
+      }
 
-    unsigned int maximum = current->GetMaximumTouchesRequired();
-    if ( maximum > maximumRequired )
-    {
-      maximumRequired = maximum;
+      unsigned int maximum = current->GetMaximumTouchesRequired();
+      if ( maximum > maximumRequired )
+      {
+        maximumRequired = maximum;
+      }
     }
   }