From 389a0eee48c1361cf3c05a239808238aac8857c9 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 20 Oct 2020 10:46:08 +0200
Subject: [PATCH] pulse-server: clean up when the context is destroyed

---
 .../module-protocol-pulse/pulse-server.c      | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/modules/module-protocol-pulse/pulse-server.c b/src/modules/module-protocol-pulse/pulse-server.c
index db709183f..ddc41292f 100644
--- a/src/modules/module-protocol-pulse/pulse-server.c
+++ b/src/modules/module-protocol-pulse/pulse-server.c
@@ -163,6 +163,7 @@ struct server {
 struct impl {
 	struct pw_loop *loop;
 	struct pw_context *context;
+	struct spa_hook context_listener;
 
 	struct pw_properties *props;
 
@@ -2963,6 +2964,8 @@ error:
 static void impl_free(struct impl *impl)
 {
 	struct server *s;
+	if (impl->context)
+		spa_hook_remove(&impl->context_listener);
 	spa_list_consume(s, &impl->servers, link)
 		server_free(s);
 	if (impl->props)
@@ -2970,6 +2973,21 @@ static void impl_free(struct impl *impl)
 	free(impl);
 }
 
+static void context_destroy(void *data)
+{
+	struct impl *impl = data;
+	struct server *s;
+	spa_list_consume(s, &impl->servers, link)
+		server_free(s);
+	spa_hook_remove(&impl->context_listener);
+	impl->context = NULL;
+}
+
+static const struct pw_context_events context_events = {
+	PW_VERSION_CONTEXT_EVENTS,
+	.destroy = context_destroy,
+};
+
 struct pw_protocol_pulse *pw_protocol_pulse_new(struct pw_context *context,
 		struct pw_properties *props, size_t user_data_size)
 {
@@ -2987,6 +3005,9 @@ struct pw_protocol_pulse *pw_protocol_pulse_new(struct pw_context *context,
 	impl->props = props;
 	spa_list_init(&impl->servers);
 
+	pw_context_add_listener(context, &impl->context_listener,
+			&context_events, impl);
+
 	impl->default_sink = (struct device) {
 		.index = 1,
 		.name = "input.pipewire",