diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-06 11:19:32 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2019-08-08 16:26:31 -0700 |
commit | 00944f7a02c98bd281778218bccc592896386f14 (patch) | |
tree | ff0ac130a72c9e1be48d28aafc9afa5a21b022ab /qt-models/diveplannermodel.cpp | |
parent | 6ce4aeb04ee4a01af43f18ef8b76224402cb5c3b (diff) | |
download | subsurface-00944f7a02c98bd281778218bccc592896386f14.tar.gz |
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>
Diffstat (limited to 'qt-models/diveplannermodel.cpp')
-rw-r--r-- | qt-models/diveplannermodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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])) { |