Core: pass dive, cylinder-id to fill_default_cylinder

The fill_default_cylinder() function calculated the MOD based
on the currently displayed dive. This does not seem to make sense:
- When importing dives, why would we care about the altitude and
  salinity of the currently displayed dive, possibly from a different
  trip.
- The planner is supposed to be thread-safe and should not touch
  global variables.

Of course this means that the importing-functions have to fill
out altitude and salinity before creating the default cylinder,
but this is their problem. For a freshly created dive they will
get the default values, which still seems less random than the
values from the displayed dive.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

2 files changed, 2 insertions, 2 deletions

diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 448a86e2d..95c6aace2 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -426,7 +426,7 @@ void CylindersModel::add()
 	}
 
 	int row = rows;
-	fill_default_cylinder(&displayed_dive.cylinder[row]);
+	fill_default_cylinder(&displayed_dive, row);
 	displayed_dive.cylinder[row].start = displayed_dive.cylinder[row].type.workingpressure;
 	displayed_dive.cylinder[row].manually_added = true;
 	displayed_dive.cylinder[row].cylinder_use = OC_GAS;
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 47d2bf275..c2bbdf084 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -165,7 +165,7 @@ void DivePlannerPointsModel::setupCylinders()
 				return;		// We have at least one cylinder
 	}
 	if (!empty_string(prefs.default_cylinder)) {
-		fill_default_cylinder(&displayed_dive.cylinder[0]);
+		fill_default_cylinder(&displayed_dive, 0);
 		displayed_dive.cylinder[0].start = displayed_dive.cylinder[0].type.workingpressure;
 	}
 	if (cylinder_none(&displayed_dive.cylinder[0])) {