Editing air or water temperature should modify dive computer, not dive

The dive fields are summary fields, the actual data needs to be in the
divecomputer specific fields.

Fixes #307

1 files changed, 16 insertions, 6 deletions

diff --git a/dive.c b/dive.c
index bc628589d..d0c22734c 100644
--- a/dive.c
+++ b/dive.c
@@ -646,19 +646,29 @@ static void fixup_duration(struct dive *dive)
 	dive->duration.seconds = duration;
 }
 
-static void fixup_watertemp(struct dive *dive)
+/*
+ * What do the dive computers say the water temperature is?
+ * (not in the samples, but as dc property for dcs that support that)
+ */
+unsigned int dc_watertemp(struct divecomputer *dc)
 {
-	struct divecomputer *dc;
 	int sum = 0, nr = 0;
 
-	for_each_dc(dive, dc) {
+	do {
 		if (dc->watertemp.mkelvin) {
 			sum += dc->watertemp.mkelvin;
 			nr++;
 		}
-	}
-	if (nr)
-		dive->watertemp.mkelvin = (sum + nr / 2) / nr;
+	} while ((dc = dc->next) != NULL);
+	if (!nr)
+		return 0;
+	return (sum + nr / 2) / nr;
+}
+
+static void fixup_watertemp(struct dive *dive)
+{
+	if (!dive->watertemp.mkelvin)
+		dive->watertemp.mkelvin = dc_watertemp(&dive->dc);
 }
 
 /*