aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2014-10-25 11:33:31 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-10-27 07:35:15 -0700
commit341eb05f835a3e41100917d39c9eaf1a1a28a55f (patch)
tree6a78d46fb236590fc900464ed3e3784bd9d386ec
parent71826cf776570433bb28616f32ed407aee4a2ec1 (diff)
downloadsubsurface-341eb05f835a3e41100917d39c9eaf1a1a28a55f.tar.gz
MainWindow: prevent a possible crash on "re-plan"
MainWindow::on_actionReplanDive_triggered(): If a dive in the divelist does not have a "DC Model" for some reason, selecting "re-plan" from the menu will pass a NULL value current_dive->dc.model to strcmp() and break before the debug output. To fix that we check if the said .model value is NULL. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/mainwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index cb1ffea2d..53c24a099 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -451,7 +451,7 @@ void MainWindow::on_actionReplanDive_triggered()
{
if (!plannerStateClean())
return;
- if (!current_dive || strcmp(current_dive->dc.model, "planned dive")) {
+ if (!current_dive || !current_dive->dc.model || strcmp(current_dive->dc.model, "planned dive")) {
qDebug() << current_dive->dc.model;
return;
}