From 5a62eeffead944ba6e9b5de50b428c3c123fe3f7 Mon Sep 17 00:00:00 2001 From: "Robert C. Helling" Date: Tue, 3 Jun 2014 20:08:38 +0200 Subject: Planner: Show gas changes at the correct depth. Gas changes (can) have a bogus waypoint following at the same depth with 0 time. Those were confusing the decision whether to show a waypoint. Signed-off-by: Robert C. Helling Signed-off-by: Dirk Hohndel --- planner.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/planner.c b/planner.c index 2347e22ed..9bb741b6a 100644 --- a/planner.c +++ b/planner.c @@ -569,7 +569,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool gaschange = true; if (plan_verbatim) { if (dp->depth != lastdepth) { - if (plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && dp->depth != dp->next->depth)) + if (plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && (dp->depth != dp->next->depth || !dp->next->time))) len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", "Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s
"), decimals, depthvalue, depth_unit, FRACTION(dp->time - lasttime, 60), @@ -583,7 +583,7 @@ static void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool gasname(&gasmix)); } } else { - if (dp->depth == lastdepth || plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && dp->depth != dp->next->depth)) { + if (dp->depth == lastdepth || plan_display_transitions || dp->entered || !dp->next || (gaschange && dp->next && (dp->depth != dp->next->depth || !dp->next->time))) { len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", "%3.0f%s"), depthvalue, depth_unit); if (plan_display_runtime) len += snprintf(buffer + len, sizeof(buffer) - len, translate("gettextFromC", " %3dmin "), (dp->time + 30) / 60); -- cgit v1.2.3-70-g09d2