oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

raop_output: fix raop_session inbalance

Browse Source 
raop_session_free must be called from raop_output_finish,
not from raop_output_remove.
In raop_output_remove, do close the ntp_server & control port.

Signed-off-by: Kurt Van Dijck <kurt.van.dijck@skynet.be>
This commit is contained in:
Kurt Van Dijck 2012-02-24 07:02:47 +01:00 committed by Max Kellermann
parent 9c36e71081
commit c551c8b31b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/raop_output_plugin.c
View File

@ -770,6 +770,11 @@ raop_output_finish(struct audio_output *ao)
g_mutex_free(rd->control_mutex);
ao_base_finish(&rd->base);
g_free(rd);
if (raop_session->raop_list == NULL) {
raop_session_free(raop_session);
raop_session = NULL;
}
}
#define RAOP_VOLUME_MIN -30
@ -870,8 +875,9 @@ raop_output_remove(struct raop_data *rd)
g_mutex_unlock(raop_session->list_mutex);
if (raop_session->raop_list == NULL) {
raop_session_free(raop_session);
raop_session = NULL;
ntp_server_close(&raop_session->ntp);
close(raop_session->ctrl.fd);
raop_session->ctrl.fd = -1;
}
}