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

Correctly save a re-planned dive

Browse source 
In commit a85a219df3 ("Add ability to replan a dive that we planned
before") I completely mishandled the saving of the replanned data.
How embarrassing.

Fixes #747
See #527

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-10-27 12:35:19 -07:00
parent 5888fa0778
commit 7b4bf88313
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/diveplanner.cpp
View file

@ -1179,9 +1179,15 @@ void DivePlannerPointsModel::createPlan()
//TODO: C-based function here?
plan(&diveplan, &cache, isPlanner(), true);
if (!current_dive || displayed_dive.id != current_dive->id)
if (!current_dive || displayed_dive.id != current_dive->id) {
// we were planning a new dive, not re-planning an existing on
record_dive(clone_dive(&displayed_dive));
} else if (current_dive && displayed_dive.id == current_dive->id) {
// we are replanning a dive - make sure changes are reflected
// correctly in the dive structure and copy it back into the dive table
fixup_dive(&displayed_dive);
copy_dive(&displayed_dive, current_dive);
}
mark_divelist_changed(true);
// Remove and clean the diveplan, so we don't delete