From 9d0741544c0d54d300d59545d13a5257850eb1ae Mon Sep 17 00:00:00 2001
From: XiaoFeng <xiaofeng@chukong-inc.com>
Date: Wed, 29 Apr 2015 15:58:44 +0800
Subject: [PATCH] Fix a logical bug that may cause null pointer been used

---
 cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
index daf6cd18f2..463da82deb 100644
--- a/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
+++ b/cocos/editor-support/cocostudio/ActionTimeline/CCFrame.cpp
@@ -400,7 +400,7 @@ void PositionFrame::onEnter(Frame *nextFrame, int currentFrameIndex)
 
 void PositionFrame::onApply(float percent)
 {
-    if (nullptr != _node && _betweenX != 0 || _betweenY != 0)
+    if (nullptr != _node && (_betweenX != 0 || _betweenY != 0))
     {
         Point p;
         p.x = _position.x + _betweenX * percent;