X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=b48a3c821d386fbf3cbfaceb8b01d9bbcc4f724d;hp=34344f4518eeff43b6bd73675bf906635f0531b5;hb=212d67a218a0e805950f85bd95143a996e957322;hpb=b4a650f369fb14961249093a0763631509130f18

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 34344f451..b48a3c821 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -749,8 +749,9 @@ error:
 	 * the stream is still in the local stream list of the channel. This call
 	 * will make sure to clean that list.
 	 */
-	cds_list_del(&metadata->metadata_stream->send_node);
 	consumer_stream_destroy(metadata->metadata_stream, NULL);
+	cds_list_del(&metadata->metadata_stream->send_node);
+	metadata->metadata_stream = NULL;
 error_no_stream:
 end:
 	return ret;
@@ -842,8 +843,8 @@ error_stream:
 	 * Clean up the stream completly because the next snapshot will use a new
 	 * metadata stream.
 	 */
-	cds_list_del(&metadata_stream->send_node);
 	consumer_stream_destroy(metadata_stream, NULL);
+	cds_list_del(&metadata_stream->send_node);
 	metadata_channel->metadata_stream = NULL;
 
 error: