Fixed crash for stage touched signal callback in JavaScript

[platform/core/uifw/dali-toolkit.git] / plugins / dali-script-v8 / src / events / event-object-generator.cpp

diff --git a/plugins/dali-script-v8/src/events/event-object-generator.cpp b/plugins/dali-script-v8/src/events/event-object-generator.cpp
index 28837ab..e90fe8c 100644 (file)
--- a/plugins/dali-script-v8/src/events/event-object-generator.cpp
+++ b/plugins/dali-script-v8/src/events/event-object-generator.cpp
@@ -118,8 +118,11 @@ v8::Local<v8::Object> CreateTouchPoint( v8::Isolate* isolate, const TouchPoint&
   // set state
   pointObject->Set( v8::String::NewFromUtf8( isolate, "state"), v8::String::NewFromUtf8( isolate, GetTouchPointStateName(touchPoint.state)));
 
-  // set the hit actor
-  pointObject->Set( v8::String::NewFromUtf8( isolate, "hitActor"), ActorWrapper::WrapActor(isolate, touchPoint.hitActor ));
+  if(touchPoint.hitActor)
+  {
+    // set the hit actor
+    pointObject->Set( v8::String::NewFromUtf8( isolate, "hitActor"), ActorWrapper::WrapActor(isolate, touchPoint.hitActor ));
+  }
 
   // Think about changing these Vector 2 from wrapped objects to JavaScript objects...