Преглед на файлове

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

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9288 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
rem..om преди 13 години
родител
ревизия
c3ed68cfbb
променени са 1 файла, в които са добавени 12 реда и са изтрити 8 реда
  1. 12 8
      engine/src/core/com/jme3/cinematic/events/AnimationTrack.java

+ 12 - 8
engine/src/core/com/jme3/cinematic/events/AnimationTrack.java

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