From 763dfef31573fdda9c5a4e26cb3446f53f704fea Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Sat, 15 Nov 2014 12:19:10 +0200 Subject: Save cylinder pressure from samples If start and end cylinder pressure is not explicitly set for secondary cylinders, we must store the start and end pressures from the sample_{start,end} attribute. Faulty behavior is obvious at least when importing Poseidon logs. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- save-xml.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/save-xml.c b/save-xml.c index a128cf04d..61740b3ea 100644 --- a/save-xml.c +++ b/save-xml.c @@ -177,8 +177,8 @@ static void save_cylinder_info(struct membuffer *b, struct dive *dive) put_pressure(b, cylinder->type.workingpressure, " workpressure='", " bar'"); show_utf8(b, description, " description='", "'", 1); put_gasmix(b, &cylinder->gasmix); - put_pressure(b, cylinder->start, " start='", " bar'"); - put_pressure(b, cylinder->end, " end='", " bar'"); + put_pressure(b, cylinder->start.mbar ? cylinder->start : cylinder->sample_start, " start='", " bar'"); + put_pressure(b, cylinder->end.mbar ? cylinder->end : cylinder->sample_end, " end='", " bar'"); put_format(b, " />\n"); } } -- cgit v1.2.3-70-g09d2