5202af9...3ea33fb

Barotrauma/BarotraumaClient/Source/Networking/Voip/VoipCapture.cs

@@ -26,7 +26,7 @@ namespace Barotrauma.Networking
             private set;
         }
 
-        public DateTime LastEnqueueAudio; 
+        public DateTime LastEnqueueAudio;
 
         public override byte QueueID
         {
@@ -47,10 +47,14 @@ namespace Barotrauma.Networking
                 throw new Exception("Tried to instance more than one VoipCapture object");
             }
 
-            Instance = new VoipCapture(deviceName)
+            var capture = new VoipCapture(deviceName)
             {
                 LatestBufferID = storedBufferID ?? BUFFER_COUNT - 1
             };
+            if (capture.captureDevice != IntPtr.Zero)
+            {
+                Instance = capture;
+            }
         }
 
         private VoipCapture(string deviceName) : base(GameMain.Client?.ID ?? 0, true, false)
@@ -60,6 +64,14 @@ namespace Barotrauma.Networking
             //set up capture device
             captureDevice = Alc.CaptureOpenDevice(deviceName, VoipConfig.FREQUENCY, ALFormat.Mono16, VoipConfig.BUFFER_SIZE * 5);
 
+            if (captureDevice == IntPtr.Zero)
+            {
+                new GUIMessageBox(TextManager.Get("Error"), TextManager.Get("VoipCaptureDeviceNotFound"));
+                Instance?.Dispose();
+                Instance = null;
+                return;
+            }
+
             ALError alError = AL.GetError();
             AlcError alcError = Alc.GetError(captureDevice);
             if (alcError != AlcError.NoError)
@@ -70,7 +82,7 @@ namespace Barotrauma.Networking
             {
                 throw new Exception("Failed to open capture device: " + alError.ToString() + " (AL)");
             }
-            
+
             Alc.CaptureStart(captureDevice);
             alcError = Alc.GetError(captureDevice);
             if (alcError != AlcError.NoError)
@@ -159,7 +171,7 @@ namespace Barotrauma.Networking
                     }
                     else if (GameMain.Config.VoiceSetting == GameSettings.VoiceMode.PushToTalk)
                     {
-                        if (PlayerInput.KeyDown(InputType.Voice))
+                        if (PlayerInput.KeyDown(InputType.Voice) && GUI.KeyboardDispatcher.Subscriber == null)
                         {
                             allowEnqueue = true;
                         }
@@ -201,7 +213,7 @@ namespace Barotrauma.Networking
         {
             Instance = null;
             capturing = false;
-            captureThread.Join();
+            captureThread?.Join();
             captureThread = null;
         }
     }

Barotrauma/BarotraumaClient/Source/Networking/Voip/VoipClient.cs

@@ -54,7 +54,7 @@ namespace Barotrauma.Networking
             else
             {
                 if (VoipCapture.Instance == null) VoipCapture.Create(GameMain.Config.VoiceCaptureDevice, storedBufferID);
-                if (VoipCapture.Instance.EnqueuedTotalLength <= 0) return;
+                if (VoipCapture.Instance == null || VoipCapture.Instance.EnqueuedTotalLength <= 0) return;
             }
 
             if (DateTime.Now >= lastSendTime + VoipConfig.SEND_INTERVAL)