From 8e8a631cbc354e47c94913f4e82295cea13b3892 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 8 Oct 2013 23:24:44 -0700 Subject: Fix crash when cancelling 'Add Dive' If selected_dive is -1 get_dive(selected_dive) will return NULL. Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 5dcd09062..d753379c7 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -559,9 +559,14 @@ void MainTab::rejectChanges() mydive->weightsystem[i] = notesBackup[mydive].weightsystem[i]; } } - multiEditEquipmentPlaceholder = *get_dive(selected_dive); - cylindersModel->setDive(&multiEditEquipmentPlaceholder); - weightModel->setDive(&multiEditEquipmentPlaceholder); + if (selected_dive > 0) { + multiEditEquipmentPlaceholder = *get_dive(selected_dive); + cylindersModel->setDive(&multiEditEquipmentPlaceholder); + weightModel->setDive(&multiEditEquipmentPlaceholder); + } else { + cylindersModel->clear(); + weightModel->clear(); + } } ui.diveNotesMessage->animatedHide(); -- cgit v1.2.3-70-g09d2