summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--divesite.c1
-rw-r--r--qt-ui/maintab.cpp4
2 files changed, 5 insertions, 0 deletions
diff --git a/divesite.c b/divesite.c
index 6e2d9353d..41d96de5d 100644
--- a/divesite.c
+++ b/divesite.c
@@ -168,6 +168,7 @@ void copy_dive_site(struct dive_site *orig, struct dive_site *copy)
copy->name = copy_string(orig->name);
copy->notes = copy_string(orig->notes);
copy->description = copy_string(orig->description);
+ copy->uuid = orig->uuid;
}
void clear_dive_site(struct dive_site *ds)
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 239286053..e61c92a3e 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -800,6 +800,8 @@ void MainTab::acceptChanges()
struct dive *added_dive = clone_dive(&displayed_dive);
record_dive(added_dive);
addedId = added_dive->id;
+ copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid));
+
// unselect everything as far as the UI is concerned and select the new
// dive - we'll have to undo/redo this later after we resort the dive_table
// but we need the dive selected for the middle part of this function - this
@@ -858,6 +860,8 @@ void MainTab::acceptChanges()
saveTaggedStrings();
saveTags();
+ copy_dive_site(&displayed_dive_site, get_dive_site_by_uuid(displayed_dive_site.uuid));
+
if (editMode != ADD && cylindersModel->changed) {
mark_divelist_changed(true);
MODIFY_SELECTED_DIVES(