mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-18 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: free object info

Browse source 
Don't remove the listeners before destroying the proxy because
we clean up the info in the destroy event.
This commit is contained in:
Wim Taymans 2020-11-09 16:52:25 +01:00
parent 99fcc95d18
commit cd3610367b
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-protocol-pulse/manager.c
View file

@ -127,12 +127,8 @@ static void object_destroy(struct object *o)
struct manager *m = o->manager; struct manager *m = o->manager;
spa_list_remove(&o->this.link); spa_list_remove(&o->this.link);
m->this.n_objects--; m->this.n_objects--;
if (o->this.proxy) { if (o->this.proxy)
if (o->info->events)
spa_hook_remove(&o->object_listener);
spa_hook_remove(&o->proxy_listener);
pw_proxy_destroy(o->this.proxy); pw_proxy_destroy(o->this.proxy);
}
if (o->this.props) if (o->this.props)
pw_properties_free(o->this.props); pw_properties_free(o->this.props);
clear_params(&o->this.param_list, SPA_ID_INVALID); clear_params(&o->this.param_list, SPA_ID_INVALID);
@ -421,6 +417,10 @@ destroy_proxy(void *data)
{ {
struct object *o = data; struct object *o = data;
if (o->info->events)
spa_hook_remove(&o->object_listener);
spa_hook_remove(&o->proxy_listener);
if (o->info && o->info->destroy) if (o->info && o->info->destroy)
o->info->destroy(o); o->info->destroy(o);