From 056b4baf1190b5300a338a4a0f5bef4b6cedd4b2 Mon Sep 17 00:00:00 2001 From: Marcos CARDINOT Date: Fri, 20 Mar 2015 01:05:41 -0300 Subject: Prevent crash when clicking re-plan without selected dive test case: 1 - make sure that you DO NOT have anything selected on the 'Dive list; 2 - in the menu bar, click on 'Log'->'Re-plan dive'; 3 - crash! Fixes #858 Signed-off-by: Marcos CARDINOT Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 21d36d92f..54c0ce7f2 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -584,9 +584,9 @@ void MainWindow::setupForAddAndPlan(const char *model) void MainWindow::on_actionReplanDive_triggered() { - if (!plannerStateClean()) + if (!plannerStateClean() || !current_dive || !current_dive->dc.model) return; - if (!current_dive || !current_dive->dc.model || strcmp(current_dive->dc.model, "planned dive")) { + else if (strcmp(current_dive->dc.model, "planned dive")) { qDebug() << "trying to replan a dive that's not a planned dive:" << current_dive->dc.model; return; } -- cgit v1.2.3-70-g09d2