From f7a470f3fb97bcc08219bbe3ff32b57a5b1ede06 Mon Sep 17 00:00:00 2001 From: Tom Elfring Date: Sun, 6 Aug 2017 15:33:53 +0200 Subject: [PATCH] Fix some NPE in VoiceInput --- .../mekanism/client/voice/VoiceInput.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/mekanism/client/voice/VoiceInput.java b/src/main/java/mekanism/client/voice/VoiceInput.java index 61132f25c..976ea38fe 100644 --- a/src/main/java/mekanism/client/voice/VoiceInput.java +++ b/src/main/java/mekanism/client/voice/VoiceInput.java @@ -13,11 +13,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class VoiceInput extends Thread { - public VoiceClient voiceClient; + private VoiceClient voiceClient; - public DataLine.Info microphone; + private DataLine.Info microphone; - public TargetDataLine targetLine; + private TargetDataLine targetLine; public VoiceInput(VoiceClient client) { @@ -32,6 +32,11 @@ public class VoiceInput extends Thread public void run() { try { + if(!AudioSystem.isLineSupported(microphone)) + { + Mekanism.logger.info("No audio system available."); + return; + } targetLine = ((TargetDataLine)AudioSystem.getLine(microphone)); targetLine.open(voiceClient.format, 2200); targetLine.start(); @@ -82,14 +87,16 @@ public class VoiceInput extends Thread audioInput.close(); } catch(Exception e) { - Mekanism.logger.error("VoiceServer: Error while running client input thread."); - e.printStackTrace(); + Mekanism.logger.error("VoiceServer: Error while running client input thread.", e); } } public void close() { - targetLine.flush(); - targetLine.close(); + if(targetLine != null) + { + targetLine.flush(); + targetLine.close(); + } } }