From 5d55d299a25d0fcc32cce4d7009d60d0a8f1813c Mon Sep 17 00:00:00 2001 From: Neil Gentleman Date: Tue, 1 Nov 2016 18:52:42 -0700 Subject: [PATCH] don't just give up when LinePool can't be initialized maybe fixes #2525 --- .../java/mage/client/util/audio/AudioManager.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java b/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java index 83cfdda935f..4169195e8dc 100644 --- a/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java +++ b/Mage.Client/src/main/java/mage/client/util/audio/AudioManager.java @@ -50,7 +50,15 @@ public class AudioManager { * AudioManager singleton. */ private static final AudioManager audioManager = new AudioManager(); - private final LinePool linePool = new LinePool(); + private LinePool linePool; + + public AudioManager() { + try { + linePool = new LinePool(); + } catch (Exception e) { + log.warn("Failed to initialize AudioManager. No sounds will be played.", e); + } + } public static AudioManager getManager() { return audioManager; @@ -297,7 +305,9 @@ public class AudioManager { } public void play(final MageClip mageClip) { - linePool.playSound(mageClip); + if (linePool != null) { + linePool.playSound(mageClip); + } } }