Merge pull request naudio#756 from piksaevalex/master

Release asio driver if init was with error
xiaoyubing · Apr 22, 2022 · 7b29cbb · 7b29cbb
2 parents 7408d5a + 76acf11
commit 7b29cbb
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/NAudio.Asio/AsioOut.cs b/NAudio.Asio/AsioOut.cs
@@ -151,8 +151,16 @@ private void InitFromName(string driverName)
             // Get the basic driver
             AsioDriver basicDriver = AsioDriver.GetAsioDriverByName(driverName);
 
-            // Instantiate the extended driver
-            driver = new AsioDriverExt(basicDriver);
+            try
+            {
+                // Instantiate the extended driver
+                driver = new AsioDriverExt(basicDriver);
+            }
+            catch
+            {
+                ReleaseDriver(basicDriver);
+                throw;
+            }
             driver.ResetRequestCallback = OnDriverResetRequest;
             this.ChannelOffset = 0;
         }
@@ -164,6 +172,15 @@ private void OnDriverResetRequest()
             DriverResetRequest?.Invoke(this, EventArgs.Empty);
         }
 
+        /// <summary>
+        /// Release driver
+        /// </summary>
+        private void ReleaseDriver(AsioDriver driver)
+        {
+            driver.DisposeBuffers();
+            driver.ReleaseComAsioDriver();
+        }
+
         /// <summary>
         /// Shows the control panel
         /// </summary>