From 9846ba9e945c59062463fd43ed09eb73b5a528c8 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 8 Feb 2013 17:48:07 +1100 Subject: Duration of a dive is the maximum duration from all divecomputers So far we always used the duration of the first divecomputer. The same fix needs to be done for some of the other calculations that always use the first divecomputer. This commit also removes some obsolete code from the webservice merging. Signed-off-by: Dirk Hohndel --- info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'info.c') diff --git a/info.c b/info.c index bc8ae5440..91cca6123 100644 --- a/info.c +++ b/info.c @@ -1145,7 +1145,7 @@ static timestamp_t dive_time_widget(struct dive *dive) */ if (amount_selected == 1) { timestamp_t when = current_dive->when; - when += current_dive->dc.duration.seconds; + when += get_duration_in_sec(current_dive); when += 60*60; utc_mkdate(when, &tm); time = &tm; -- cgit v1.2.3-70-g09d2