smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-25 14:47:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix crash when unable to open portaudio stream

Browse source 
Calling Pa_Terminate after failing to open stream causes an assertion
This commit is contained in:
Tim Mayberry 2015-04-01 22:43:39 +10:00
parent b6db19a5c6
commit e2001ac4f3
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/backends/portaudio/portaudio_io.cc
View file

@ -306,15 +306,10 @@ PortAudioIO::pcm_setup (
const PaDeviceInfo *nfo_out;
const PaStreamInfo *nfo_s;
if (!_initialized) {
err = Pa_Initialize();
}
if (err != paNoError) {
if (!initialize_pa()) {
fprintf(stderr, "PortAudio Initialization Failed\n");
goto error;
}
_initialized = true;
if (device_input == -1) {
device_input = Pa_GetDefaultInputDevice();
@ -459,7 +454,6 @@ error:
_playback_channels = 0;
free (_input_buffer); _input_buffer = NULL;
free (_output_buffer); _output_buffer = NULL;
Pa_Terminate();
return -1;
}