X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fevents-private.h;h=a3caf7aed9092796e2e79e95b999a678c5d45baf;hp=6208e563d2315f94994f88c183041bacc8d3d65c;hb=f60efc0e475b3c2fca3b2afc584615f6c482c9e7;hpb=75d9ab4b8164f7b2012da916c5b36f1445e9ee09

diff --git a/formats/ctf/events-private.h b/formats/ctf/events-private.h
index 6208e563..a3caf7ae 100644
--- a/formats/ctf/events-private.h
+++ b/formats/ctf/events-private.h
@@ -33,7 +33,12 @@ uint64_t ctf_get_real_timestamp(struct ctf_stream_definition *stream,
 	uint64_t ts_nsec;
 	struct ctf_trace *trace = stream->stream_class->trace;
 	struct trace_collection *tc = trace->collection;
-	uint64_t tc_offset = tc->single_clock_offset_avg;
+	uint64_t tc_offset;
+
+	if (tc->clock_use_offset_avg)
+		tc_offset = tc->single_clock_offset_avg;
+	else
+		tc_offset = trace->single_clock->offset;
 
 	ts_nsec = clock_cycles_to_ns(stream->current_clock, timestamp);
 	ts_nsec += tc_offset;	/* Add offset */