Commit e1ee4505 authored by Eric Wong's avatar Eric Wong

jack: fix multiple segfaults when jackd hasn't been started

git-svn-id: https://svn.musicpd.org/mpd/trunk@5250 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent eb2a02dc
......@@ -65,19 +65,28 @@ static void jack_finishDriver(AudioOutput * audioOutput)
{
JackData *jd = audioOutput->data;
jack_deactivate(jd->client);
jack_client_close(jd->client);
if (jd && jd->client) {
jack_deactivate(jd->client);
jack_client_close(jd->client);
}
ERROR("disconnect_jack (pid=%d)\n", getpid ());
if ( strcmp(name, "mpd") ) free(name);
if ( output_ports[0] ) free(output_ports[0]);
if ( output_ports[1] ) free(output_ports[1]);
jack_ringbuffer_free(jd->ringbuffer[0]);
jack_ringbuffer_free(jd->ringbuffer[1]);
free(jd->samples1);
free(jd->samples2);
free(jd);
if (jd) {
if (jd->ringbuffer[0])
jack_ringbuffer_free(jd->ringbuffer[0]);
if (jd->ringbuffer[1])
jack_ringbuffer_free(jd->ringbuffer[1]);
if (jd->samples1)
free(jd->samples1);
if (jd->samples2)
free(jd->samples2);
free(jd);
audioOutput->data = NULL;
}
}
static int srate(jack_nframes_t rate, void *data)
......@@ -289,7 +298,7 @@ static int jack_openDevice(AudioOutput *audioOutput)
jd = newJackData();
audioOutput->data = jd;
if ( !connect_jack(audioOutput) ) {
if (connect_jack(audioOutput) < 0) {
jack_finishDriver(audioOutput);
return -1;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment