summaryrefslogtreecommitdiffstats
path: root/qt-models/diveplannermodel.cpp
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2017-02-04 14:12:43 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-02-04 07:09:35 -0800
commit2516ae7e5f2a8912a394181fe451337a3a22c9ee (patch)
tree946737d8f4ef1f8ed749bf188c2d5ac7cd3331e0 /qt-models/diveplannermodel.cpp
parentcd38cda186c0fd0849854ae85c012a152ec5ffbc (diff)
downloadsubsurface-2516ae7e5f2a8912a394181fe451337a3a22c9ee.tar.gz
Let cylinderid = -1 mean same gas as before
It's not too clever to give 0 a special meaning (as here: use same gas as for previous leg) when 0 is a legitimate value. This should solve Willem's gas disappearance problem when reediting a dive in the planner. Signed-off-by: Robert C. Helling <helling@atdotde.de>
Diffstat (limited to 'qt-models/diveplannermodel.cpp')
-rw-r--r--qt-models/diveplannermodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 5a06313f4..38fbbb1b8 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -588,11 +588,12 @@ int DivePlannerPointsModel::lastEnteredPoint()
return -1;
}
+// cylinderid_in == -1 means same gas as before.
int DivePlannerPointsModel::addStop(int milimeters, int seconds, int cylinderid_in, int ccpoint, bool entered)
{
int cylinderid = 0;
bool usePrevious = false;
- if (cylinderid_in)
+ if (cylinderid_in >= 0)
cylinderid = cylinderid_in;
else
usePrevious = true;