From e96c5af0212aab8e5f5f4ae078f640b7fde97800 Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Tue, 15 Mar 2016 17:57:13 +0000 Subject: [PATCH] Fixed crash for stage touched signal callback in JavaScript Change-Id: I11858186c448ba9d2a21f597351fe5275667d514 --- plugins/dali-script-v8/src/events/event-object-generator.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 --- 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 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... -- 2.7.4