From ff5c04eb9757ef12d451be2ab0597a88db85c068 Mon Sep 17 00:00:00 2001 From: Jan Mulder Date: Thu, 20 Apr 2017 10:49:50 +0200 Subject: [PATCH] Do not abort when there is no current dive Yes, currentdive can be undefined in case of of a new logbook and starting the planner right away. Do not abort on that. Reported-by: Robert C. Helling Signed-off-by: Jan Mulder --- desktop-widgets/mainwindow.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 0ce5ef648..506878c98 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -953,7 +953,8 @@ void MainWindow::on_actionDivePlanner_triggered() DivePlannerPointsModel::instance()->setupStartTime(); DivePlannerPointsModel::instance()->createSimpleDive(); // plan the dive in the same mode as the currently selected one - divePlannerSettingsWidget()->setDiveMode(current_dive->dc.divemode); + if (current_dive) + divePlannerSettingsWidget()->setDiveMode(current_dive->dc.divemode); DivePictureModel::instance()->updateDivePictures(); divePlannerWidget()->setReplanButton(false); }