sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

AnimationTrack null checked the animation channel in onStop, onPause and setLoopMode to avoid NPE

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9288 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-04-11 22:09:37 +00:00
parent bc0207f1fc
commit c3ed68cfbb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/src/core/com/jme3/cinematic/events/AnimationTrack.java
View File

@ -146,18 +146,16 @@ public class AnimationTrack extends AbstractCinematicEvent {
channel.setSpeed(speed);
channel.setLoopMode(loopMode);
channel.setTime(time);
}
}
}
@Override
public void setSpeed(float speed) {
super.setSpeed(speed);
if(channel!=null){
if (channel != null) {
channel.setSpeed(speed);
}
}
@Override
public void onUpdate(float tpf) {
@ -165,19 +163,25 @@ public class AnimationTrack extends AbstractCinematicEvent {
@Override
public void onStop() {
channel.setTime(0);
channel.reset(false);
if (channel != null) {
channel.setTime(0);
channel.reset(false);
}
}
@Override
public void onPause() {
channel.getControl().setEnabled(false);
if (channel != null) {
channel.getControl().setEnabled(false);
}
}
@Override
public void setLoopMode(LoopMode loopMode) {
super.setLoopMode(loopMode);
channel.setLoopMode(loopMode);
if (channel != null) {
channel.setLoopMode(loopMode);
}
}
@Override