mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'addDiveGasFix'

Browse source
This commit is contained in:
Dirk Hohndel 2013-11-09 20:35:09 +09:00
commit 487efb1ee9
8 changed files with 113 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/maintab.cpp
View file

@ -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 );