Merge pull request #162 from Jajcus/release-alsa-card-on-init-error

Release audio devices when alsa_driver_new fails
jackaudio · Dec 6, 2015 · f3cf9d6 · f3cf9d6
2 parents dab7e50 + 57e16b9
commit f3cf9d6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp
@@ -346,7 +346,7 @@ int JackAlsaDriver::Open(jack_nframes_t nframes,
         fPlaybackChannels = ((alsa_driver_t *)fDriver)->playback_nchannels;
         return 0;
     } else {
-        JackAudioDriver::Close();
+        Close();
         return -1;
     }
 }
@@ -356,7 +356,9 @@ int JackAlsaDriver::Close()
     // Generic audio driver close
     int res = JackAudioDriver::Close();
 
-    alsa_driver_delete((alsa_driver_t*)fDriver);
+    if (fDriver) {
+        alsa_driver_delete((alsa_driver_t*)fDriver);
+    }
 
     if (JackServerGlobals::on_device_release != NULL)
     {