From 8ff7a5fa293e575dbab74c39c6308688c6c96bfa Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 20 Feb 2018 12:50:44 +0100
Subject: [PATCH] node: set state before calling into methods

---
 src/pipewire/node.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/pipewire/node.c b/src/pipewire/node.c
index 4132666db..5408a1d3d 100644
--- a/src/pipewire/node.c
+++ b/src/pipewire/node.c
@@ -50,13 +50,11 @@ struct resource_data {
 
 /** \endcond */
 
-static int pause_node(struct pw_node *this)
+
+static int do_pause_node(struct pw_node *this)
 {
 	int res = 0;
 
-	if (this->info.state <= PW_NODE_STATE_IDLE)
-		return 0;
-
 	pw_log_debug("node %p: pause node", this);
 	res = spa_node_send_command(this->node,
 				    &SPA_COMMAND_INIT(this->core->type.command_node.Pause));
@@ -66,6 +64,14 @@ static int pause_node(struct pw_node *this)
 	return res;
 }
 
+static int pause_node(struct pw_node *this)
+{
+	if (this->info.state <= PW_NODE_STATE_IDLE)
+		return 0;
+
+	return do_pause_node(this);
+}
+
 static int start_node(struct pw_node *this)
 {
 	int res = 0;
@@ -911,17 +917,17 @@ void pw_node_update_state(struct pw_node *node, enum pw_node_state state, char *
 		pw_log_debug("node %p: update state from %s -> %s", node,
 			     pw_node_state_as_string(old), pw_node_state_as_string(state));
 
-		if (state == PW_NODE_STATE_IDLE) {
-			if (impl->pause_on_idle)
-				pause_node(node);
-			node_deactivate(node);
-		}
-
 		if (node->info.error)
 			free((char*)node->info.error);
 		node->info.error = error;
 		node->info.state = state;
 
+		if (state == PW_NODE_STATE_IDLE) {
+			if (impl->pause_on_idle)
+				do_pause_node(node);
+			node_deactivate(node);
+		}
+
 		spa_hook_list_call(&node->listener_list, struct pw_node_events, state_changed,
 				 old, state, error);