summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Anton Lundin <glance@acc.umu.se>2014-06-27 08:04:47 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-06-27 06:54:59 -0700
commitb6fac74f6edfe7a0c129676f62c6c9cb4819cea1 (patch)
tree2657ac13db2638adaf47857197d4c0937143aa70
parent707b9f066649daa1992b22eb4879d47cc669607e (diff)
downloadsubsurface-b6fac74f6edfe7a0c129676f62c6c9cb4819cea1.tar.gz
Care about drop_stone_mode in createSimpleDive
The checkbox is remembered as long as the program is still running, so if you planned one dive with drop_stone_mode and saved/aborted and then tried to plan another one we had a first "down" waypoint from createSimpleDive and drop_stone_mode was also enabled. This makes sure we don't add the first waypoint in createSimpleDive when drop_stone_mode is enabled and lets that add a implicit first waypoint. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/diveplanner.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 1afd62e13..3f144db97 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -70,7 +70,11 @@ void DivePlannerPointsModel::createSimpleDive()
// let's use the gas from the first cylinder
gas = stagingDive->cylinder[0].gasmix;
- plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, &gas, 0, true);
+ // If we're in drop_stone_mode, don't add a first point.
+ // It will be added implicit.
+ if (!drop_stone_mode)
+ plannerModel->addStop(M_OR_FT(15, 45), 1 * 60, &gas, 0, true);
+
plannerModel->addStop(M_OR_FT(15, 45), 40 * 60, &gas, 0, true);
if (!isPlanner()) {
plannerModel->addStop(M_OR_FT(5, 15), 42 * 60, &gas, 0, true);