From ac6a568729a7bbbb82d6714d3b8087cd09d349b2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 29 Jan 2019 09:51:20 +0100 Subject: [PATCH] global: remove the global from the map when we unlink --- src/pipewire/global.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pipewire/global.c b/src/pipewire/global.c index e550be874..3d90b938a 100644 --- a/src/pipewire/global.c +++ b/src/pipewire/global.c @@ -168,6 +168,7 @@ static int global_unregister(struct pw_global *global) pw_resource_destroy(resource); spa_list_remove(&global->link); + pw_map_remove(&core->globals, global->id); pw_core_events_global_removed(core, global); impl->registered = false; @@ -302,7 +303,6 @@ int pw_global_update_permissions(struct pw_global *global, struct pw_client *cli */ void pw_global_destroy(struct pw_global *global) { - struct pw_core *core = global->core; struct pw_resource *resource; pw_log_debug("global %p: destroy %u", global, global->id); @@ -313,8 +313,6 @@ void pw_global_destroy(struct pw_global *global) spa_list_consume(resource, &global->resource_list, link) pw_resource_destroy(resource); - pw_map_remove(&core->globals, global->id); - pw_log_debug("global %p: free", global); pw_global_events_free(global);