diff options
| -rw-r--r-- | save-git.c | 11 | ||||
| -rw-r--r-- | save-xml.c | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/save-git.c b/save-git.c index cf6bd37e9..84eb1a316 100644 --- a/save-git.c +++ b/save-git.c @@ -827,6 +827,17 @@ static void save_divesites(git_repository *repo, struct dir *tree) for (int i = 0; i < dive_site_table.nr; i++) { struct membuffer b = { 0 }; struct dive_site *ds = get_dive_site(i); + if (dive_site_is_empty(ds)) { + int j; + struct dive *d; + for_each_dive(j, d) { + if (d->dive_site_uuid == ds->uuid) + d->dive_site_uuid = 0; + } + delete_dive_site(get_dive_site(i)->uuid); + i--; // since we just deleted that one + continue; + } int size = sizeof("Site-012345678"); char name[size]; snprintf(name, size, "Site-%08x", ds->uuid); diff --git a/save-xml.c b/save-xml.c index 5a0c6976c..c09b90812 100644 --- a/save-xml.c +++ b/save-xml.c @@ -506,6 +506,17 @@ void save_dives_buffer(struct membuffer *b, const bool select_only) put_format(b, "<divesites>\n"); for (i = 0; i < dive_site_table.nr; i++) { struct dive_site *ds = get_dive_site(i); + if (dive_site_is_empty(ds)) { + int j; + struct dive *d; + for_each_dive(j, d) { + if (d->dive_site_uuid == ds->uuid) + d->dive_site_uuid = 0; + } + delete_dive_site(get_dive_site(i)->uuid); + i--; // since we just deleted that one + continue; + } put_format(b, "<site uuid='%8x' ", ds->uuid); show_utf8(b, ds->name, " name='", "'", 1); if (ds->latitude.udeg || ds->longitude.udeg) { |