From 1578c1edb2dd7e74b111e6b6b5c7883c37554235 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 8 Nov 2013 18:15:04 +0900 Subject: Be consistent when passing around gas data in the planner We need to make sure that the correct segment has the correct gas assigned to it - and that those gases are correctly tracked when editing a manually added dive as well. Signed-off-by: Dirk Hohndel --- qt-ui/maintab.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'qt-ui/maintab.cpp') diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index dfcb48a0c..8230cf663 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -538,14 +538,13 @@ void MainTab::rejectChanges() if (mainWindow() && mainWindow()->dive_list()->selectedTrips.count() == 1){ ui.notes->setText(notesBackup[NULL].notes ); ui.location->setText(notesBackup[NULL].location); - }else{ + } else { if (editMode == ADD) { // clean up delete_single_dive(selected_dive); DivePlannerPointsModel::instance()->cancelPlan(); - } - else if (editMode == MANUALLY_ADDED_DIVE ){ - DivePlannerPointsModel::instance()->undoEdition(); + } else if (editMode == MANUALLY_ADDED_DIVE ) { + DivePlannerPointsModel::instance()->undoEdition(); // that's BOGUS... just copy the original dive back and be done with it... } struct dive *curr = current_dive; ui.notes->setText(notesBackup[curr].notes ); -- cgit v1.2.3-70-g09d2