From cbfa6150705e7bfa12806167edf228425c52a99d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Tue, 6 Oct 2015 22:01:17 +0200
Subject: [PATCH] Null check in Sound handler in case of partial
 initializations.

---
 src/main/scala/li/cil/oc/client/Sound.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/li/cil/oc/client/Sound.scala b/src/main/scala/li/cil/oc/client/Sound.scala
index 554173524..ff33bfc2b 100644
--- a/src/main/scala/li/cil/oc/client/Sound.scala
+++ b/src/main/scala/li/cil/oc/client/Sound.scala
@@ -53,7 +53,7 @@ object Sound {
   // Set in init event.
   var manager: SoundManager = _
 
-  def soundSystem = manager.sndSystem
+  def soundSystem = if (manager != null) manager.sndSystem else null
 
   private def updateVolume() {
     val volume =