From 59e69d8329d819dba7e90e80515bbd509b26e904 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 22 Jul 2020 16:49:29 +0200 Subject: [PATCH] impl-port: unlink as part of destroy --- src/pipewire/impl-node.c | 6 ------ src/pipewire/impl-port.c | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c index 469ae2202..61a85e44d 100644 --- a/src/pipewire/impl-node.c +++ b/src/pipewire/impl-node.c @@ -1617,12 +1617,6 @@ void pw_impl_node_destroy(struct pw_impl_node *node) spa_node_set_callbacks(node->node, NULL, NULL); } - pw_log_debug(NAME" %p: unlink ports", node); - spa_list_for_each(port, &node->input_ports, link) - pw_impl_port_unlink(port); - spa_list_for_each(port, &node->output_ports, link) - pw_impl_port_unlink(port); - pw_log_debug(NAME" %p: destroy ports", node); spa_list_consume(port, &node->input_ports, link) pw_impl_port_destroy(port); diff --git a/src/pipewire/impl-port.c b/src/pipewire/impl-port.c index 4971f371f..1111302a4 100644 --- a/src/pipewire/impl-port.c +++ b/src/pipewire/impl-port.c @@ -983,6 +983,8 @@ void pw_impl_port_destroy(struct pw_impl_port *port) pw_impl_port_emit_destroy(port); + pw_impl_port_unlink(port); + pw_log_debug(NAME" %p: control destroy", port); spa_list_consume(control, &port->control_list[0], port_link) pw_control_destroy(control);