summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2019-03-26 10:35:41 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-29 06:51:12 -0700
commit30746e5d3f6b20a0603359f55f232fb082362f39 (patch)
treefaed54f6be3a0e29afd00551ebb486a3eb9a64b1
parent67a1981fbd5f2057c0ff3def8e0452216d5a9edf (diff)
downloadsubsurface-30746e5d3f6b20a0603359f55f232fb082362f39.tar.gz
Make sure surface air is not considered a deco gas
it creapt in through the gaschange events. Signed-off-by: Robert C. Helling <helling@atdotde.de>
-rw-r--r--core/planner.c1
-rw-r--r--qt-models/cylindermodel.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/planner.c b/core/planner.c
index ff483a0ac..ce3ef30f2 100644
--- a/core/planner.c
+++ b/core/planner.c
@@ -1085,6 +1085,7 @@ bool plan(struct deco_state *ds, struct diveplan *diveplan, struct dive *dive, i
// Switch to an empty air cylinder for breathing air at the surface
// If no empty cylinder is found, keep using last deco gas
current_cylinder = i;
+ dive->cylinder[i].cylinder_use = NOT_USED;
break;
}
plan_add_segment(diveplan, prefs.surface_segment, 0, current_cylinder, 0, false, OC);
diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 11d4595ee..129f25a6c 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -442,6 +442,7 @@ void CylindersModel::add()
fill_default_cylinder(&displayed_dive.cylinder[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;
beginInsertRows(QModelIndex(), row, row);
rows++;
changed = true;