From e6c51cc31401ebe39d6363487ecc3713e4ee003d Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 9 Dec 2013 07:43:00 +0100 Subject: Implement a settingsChanged in DivePlannerWidget This is so we can default to the GF's from the preferences. We need the bail handler in createTemporaryPlan, because its triggered when we change GF's, and if we don't have a stagingDive there, we will access a NULL-pointer. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- qt-ui/diveplanner.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'qt-ui/diveplanner.cpp') diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 2abf68f94..932c6366a 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -1002,6 +1002,12 @@ DivePlannerWidget::DivePlannerWidget(QWidget* parent, Qt::WindowFlags f): QWidge setMinimumHeight(0); } +void DivePlannerWidget::settingsChanged() +{ + ui.gflow->setValue(prefs.gflow); + ui.gfhigh->setValue(prefs.gfhigh); +} + void DivePlannerPointsModel::addCylinder_clicked() { CylindersModel::instance()->add(); @@ -1402,6 +1408,9 @@ void DivePlannerPointsModel::createTemporaryPlan() // Get the user-input and calculate the dive info // Not sure if this is the place to create the diveplan... // We just start with a surface node at time = 0 + if (!stagingDive) + return; + diveplan.dp = NULL; int lastIndex = -1; for (int i = 0; i < rowCount(); i++) { -- cgit v1.2.3-70-g09d2