From 72561e7a8b98f19eb698bf802a337caf76b1a2cd Mon Sep 17 00:00:00 2001 From: "PSp..om" Date: Fri, 17 Feb 2012 04:20:14 +0000 Subject: [PATCH] Made the app-states taking constructor more defensive so that it can be called with null in various ways without throwing NPEs. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9167 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/app/SimpleApplication.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/src/core/com/jme3/app/SimpleApplication.java b/engine/src/core/com/jme3/app/SimpleApplication.java index 0b2084764..c79ce8333 100644 --- a/engine/src/core/com/jme3/app/SimpleApplication.java +++ b/engine/src/core/com/jme3/app/SimpleApplication.java @@ -102,8 +102,13 @@ public abstract class SimpleApplication extends Application { public SimpleApplication( AppState... initialStates ) { super(); - for (AppState a : initialStates) { - stateManager.attach(a); + + if (initialStates != null) { + for (AppState a : initialStates) { + if (a != null) { + stateManager.attach(a); + } + } } }