mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-15 07:00:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

proxy: don't remove ourselves from a destroyed core

Browse source 
The core will clear (or have cleared) all the proxies.
This commit is contained in:
Wim Taymans 2019-12-13 11:00:41 +01:00
parent f724319e8a
commit 3eec3f5abf
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pipewire/core.c
View file

@ -172,7 +172,6 @@ static int destroy_proxy(void *object, void *data)
if (object == NULL) if (object == NULL)
return 0; return 0;
p->core = NULL;
if (object != core) if (object != core)
pw_proxy_remove(p); pw_proxy_remove(p);
@ -198,9 +197,6 @@ static void proxy_core_destroy(void *data)
spa_list_for_each_safe(filter, f2, &core->filter_list, link) spa_list_for_each_safe(filter, f2, &core->filter_list, link)
pw_filter_disconnect(filter); pw_filter_disconnect(filter);
pw_protocol_client_disconnect(core->conn);
core->client = NULL;
pw_map_for_each(&core->objects, destroy_proxy, core); pw_map_for_each(&core->objects, destroy_proxy, core);
pw_map_reset(&core->objects); pw_map_reset(&core->objects);
@ -209,6 +205,9 @@ static void proxy_core_destroy(void *data)
spa_list_consume(filter, &core->filter_list, link) spa_list_consume(filter, &core->filter_list, link)
pw_filter_destroy(filter); pw_filter_destroy(filter);
pw_protocol_client_disconnect(core->conn);
core->client = NULL;
pw_mempool_destroy(core->pool); pw_mempool_destroy(core->pool);
pw_protocol_client_destroy(core->conn); pw_protocol_client_destroy(core->conn);

2
src/pipewire/proxy.c
View file

@ -229,7 +229,7 @@ void pw_proxy_destroy(struct pw_proxy *proxy)
} }
} }
if (proxy->removed) { if (proxy->removed) {
if (proxy->core) if (proxy->core && !proxy->core->destroyed)
pw_map_remove(&proxy->core->objects, proxy->id); pw_map_remove(&proxy->core->objects, proxy->id);
pw_proxy_unref(proxy); pw_proxy_unref(proxy);