raop_output: fix raop_session inbalance

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>

raop_output: fix raop_session inbalance
c551c8b3 · Kurt Van Dijck · Max Kellermann · 9c36e710 · c551c8b3
Commit c551c8b3 authored Feb 24, 2012 by Kurt Van Dijck Committed by Max Kellermann Mar 01, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

raop_output_plugin.c src/output/raop_output_plugin.c +8 -2

No files found.
--- a/src/output/raop_output_plugin.c
+++ b/src/output/raop_output_plugin.c
@@ -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;
 	}
 }