X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-comm.c;h=cd4217f187909ebbb7d6500b05673d01785d2d96;hb=4d4bf6eb5529937cbbb2b4e891a6207edb1a26da;hp=76dc6bbb14bc2ea6a045cd2ddb8072365fb9416c;hpb=251fc08ca342edbca24b30492f0d02394ec11414;p=babeltrace.git

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index 76dc6bbb..cd4217f1 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -676,14 +676,18 @@ retry:
 			ret = append_metadata(ctx, stream);
 			if (ret)
 				goto error;
-			goto retry;
 		}
 		if (rp.flags & LTTNG_VIEWER_FLAG_NEW_STREAM) {
+			printf_verbose("get_data_packet: new streams needed\n");
 			ret = ask_new_streams(ctx);
 			if (ret < 0)
 				goto error;
-			g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
-					ctx->bt_ctx);
+			g_hash_table_foreach(ctx->session->ctf_traces,
+					add_traces, ctx->bt_ctx);
+		}
+		if (rp.flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
+				| LTTNG_VIEWER_FLAG_NEW_STREAM)) {
+			goto retry;
 		}
 		fprintf(stderr, "[error] get_data_packet: error\n");
 		ret = -1;
@@ -745,7 +749,7 @@ retry:
 		goto error;
 	}
 	assert(ret_len == len);
-
+	ret = 0;
 end:
 error:
 	return ret;
@@ -991,8 +995,8 @@ retry:
 			ret = ask_new_streams(ctx);
 			if (ret < 0)
 				goto error;
-			g_hash_table_foreach(ctx->session->ctf_traces, add_traces,
-					ctx->bt_ctx);
+			g_hash_table_foreach(ctx->session->ctf_traces,
+					add_traces, ctx->bt_ctx);
 		}
 		break;
 	case LTTNG_VIEWER_INDEX_RETRY: