From 4784e57370ae272a445666d89b5915644cd8de7a Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 4 Oct 2017 13:12:14 +0200
Subject: [PATCH 1/2] Refactored mutex use while closing streams in
 CPortAudioHandle (should fix #320)

---
 Vocaluxe/Lib/Sound/CPortAudioHandle.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Vocaluxe/Lib/Sound/CPortAudioHandle.cs b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
index 217afafa..6443a8cb 100644
--- a/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
+++ b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
@@ -74,12 +74,14 @@ namespace Vocaluxe.Lib.Sound
             }
             lock (_Mutex)
             {
+                if (_Disposed)
+                    return;
                 Debug.Assert(_RefCount > 0);
                 _RefCount--;
                 if (_RefCount == 0)
                     PortAudio.Pa_Terminate();
+                _Disposed = true;
             }
-            _Disposed = true;
         }
 
         public void Dispose()
@@ -100,11 +102,11 @@ namespace Vocaluxe.Lib.Sound
                                             double sampleRate, uint framesPerBuffer, PortAudio.PaStreamFlags streamFlags,
                                             PortAudio.PaStreamCallbackDelegate streamCallback, IntPtr userData)
         {
-            if (_Disposed)
-                throw new ObjectDisposedException("PortAudioHandle already disposed");
-
             lock (_Mutex)
             {
+                if (_Disposed)
+                    throw new ObjectDisposedException("PortAudioHandle already disposed");
+
                 PortAudio.PaError res = PortAudio.Pa_OpenStream(out stream, ref inputParameters, ref outputParameters, sampleRate, framesPerBuffer, streamFlags, streamCallback,
                                                                 userData);
                 if (res == PortAudio.PaError.paNoError)
@@ -157,11 +159,11 @@ namespace Vocaluxe.Lib.Sound
 
         public void CloseStream(IntPtr stream)
         {
-            if (_Disposed)
-                throw new ObjectDisposedException("PortAudioHandle already disposed");
-
             lock (_Mutex)
             {
+                if (_Disposed)
+                    throw new ObjectDisposedException("PortAudioHandle already disposed");
+
                 PortAudio.Pa_CloseStream(stream);
                 _Streams.Remove(stream);
             }

From ad5ffd7578736cfe45b0a9dc5bfa94ecc44dc46f Mon Sep 17 00:00:00 2001
From: lukeIam <2lukeiam@gmail.com>
Date: Wed, 4 Oct 2017 14:20:31 +0200
Subject: [PATCH 2/2] Catch potential errors from PortAudio Close() and
 Dispose()

---
 Vocaluxe/Lib/Sound/CPortAudioHandle.cs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/Vocaluxe/Lib/Sound/CPortAudioHandle.cs b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
index 6443a8cb..81c4d9b0 100644
--- a/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
+++ b/Vocaluxe/Lib/Sound/CPortAudioHandle.cs
@@ -79,7 +79,16 @@ namespace Vocaluxe.Lib.Sound
                 Debug.Assert(_RefCount > 0);
                 _RefCount--;
                 if (_RefCount == 0)
-                    PortAudio.Pa_Terminate();
+                {
+                    try
+                    {
+                        PortAudio.Pa_Terminate();
+                    }
+                    catch (Exception ex)
+                    {
+                        CLog.LogError(errorText: $"Error disposing PortAudio: {ex.Message}", e: ex);
+                    }
+                }
                 _Disposed = true;
             }
         }
@@ -164,7 +173,14 @@ namespace Vocaluxe.Lib.Sound
                 if (_Disposed)
                     throw new ObjectDisposedException("PortAudioHandle already disposed");
 
-                PortAudio.Pa_CloseStream(stream);
+                try
+                {
+                    PortAudio.Pa_CloseStream(stream);
+                }
+                catch (Exception ex)
+                {
+                    CLog.LogError(errorText:$"Error closing stream: {ex.Message}", e:ex);
+                }
                 _Streams.Remove(stream);
             }
         }