From b6fac74f6edfe7a0c129676f62c6c9cb4819cea1 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Fri, 27 Jun 2014 08:04:47 +0200 Subject: [PATCH] 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 Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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);