diff --git a/src/main/java/electrosphere/engine/assetmanager/AssetManager.java b/src/main/java/electrosphere/engine/assetmanager/AssetManager.java index 7c6f444c..762d19f7 100644 --- a/src/main/java/electrosphere/engine/assetmanager/AssetManager.java +++ b/src/main/java/electrosphere/engine/assetmanager/AssetManager.java @@ -4,6 +4,7 @@ import electrosphere.audio.AudioBuffer; import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.CollisionEngine; import electrosphere.collision.collidable.Collidable; +import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.queue.QueuedAsset; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.actor.ActorShaderMask; @@ -104,9 +105,11 @@ public class AssetManager { texturesLoadedIntoMemory.put(currentPath, new Texture(currentPath)); } //audio from disk - for(String currentPath : audioInQueue){ - audioInQueue.remove(currentPath); - audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath)); + if(Globals.audioEngine != null && Globals.audioEngine.initialized()){ + for(String currentPath : audioInQueue){ + audioInQueue.remove(currentPath); + audioLoadedIntoMemory.put(currentPath, new AudioBuffer(currentPath)); + } } //shaders for(ActorShaderMask currentShader : shadersInQueue){