diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-09 20:35:09 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-09 20:35:09 +0900 |
| commit | 487efb1ee91c5b7e648f31ef3700fae2c45753d4 (patch) | |
| tree | ee9226b8abb20f09473dd42ef0dca4578433911d /qt-ui/maintab.cpp | |
| parent | 5dce73f62b21b9d70cf4d7f51c8d6ec9cf8bb9f1 (diff) | |
| parent | 6d5b2d75927b23183f8864bebf894b7bf4828311 (diff) | |
| download | subsurface-487efb1ee91c5b7e648f31ef3700fae2c45753d4.tar.gz | |
Merge branch 'addDiveGasFix'
Diffstat (limited to 'qt-ui/maintab.cpp')
| -rw-r--r-- | qt-ui/maintab.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index ef9129c34..2708687da 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -539,14 +539,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 ); |