Correcly look at all relevant dive computer structures

When calculating maxima for a dive, we need to take data from all existing
dive computer structures plus potentially also a fake dive computer
structure that is just passed in in order to create a meaningful profile.

Commit 86c961614bfa ("Actually walk all dive computers, don't just claim
to do so") missed that second case and no longer took the fake_dc into
account, breaking the display of dives that don't have samples.

Reported-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/profile.c b/profile.c
index 0e5306adb..3e5887bd0 100644
--- a/profile.c
+++ b/profile.c
@@ -442,9 +442,10 @@ static void check_setpoint_events(struct dive *dive, struct divecomputer *dc, st
 }
 
 
-struct plot_info calculate_max_limits_new(struct dive *dive)
+struct plot_info calculate_max_limits_new(struct dive *dive, struct divecomputer *given_dc)
 {
 	struct divecomputer *dc = &(dive->dc);
+	bool seen = false;
 	static struct plot_info pi;
 	int maxdepth = dive->maxdepth.mm;
 	int maxtime = 0;
@@ -465,6 +466,8 @@ struct plot_info calculate_max_limits_new(struct dive *dive)
 
 	/* Then do all the samples from all the dive computers */
 	do {
+		if (dc == given_dc)
+			seen = true;
 		int i = dc->samples;
 		int lastdepth = 0;
 		struct sample *s = dc->sample;
@@ -497,7 +500,12 @@ struct plot_info calculate_max_limits_new(struct dive *dive)
 			lastdepth = depth;
 			s++;
 		}
-	} while ((dc = dc->next) != NULL);
+		dc = dc->next;
+		if (dc == NULL && !seen) {
+			dc = given_dc;
+			seen = true;
+		}
+	} while (dc != NULL);
 
 	if (minpressure > maxpressure)
 		minpressure = 0;