summaryrefslogtreecommitdiffstats
path: root/core/load-git.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/load-git.c')
-rw-r--r--core/load-git.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/load-git.c b/core/load-git.c
index b0d94f3cf..8483b9cf0 100644
--- a/core/load-git.c
+++ b/core/load-git.c
@@ -159,9 +159,9 @@ static void parse_dive_gps(char *line, struct membuffer *str, void *_dive)
if (!ds) {
ds = get_dive_site_by_gps(&location);
if (!ds)
- dive->dive_site_uuid = create_dive_site_with_gps("", &location, dive->when)->uuid;
+ dive->dive_site = create_dive_site_with_gps("", &location, dive->when);
else
- dive->dive_site_uuid = ds->uuid;
+ dive->dive_site = ds;
} else {
if (dive_site_has_gps_location(ds) && !same_location(&ds->location, &location)) {
const char *coords = printGPSCoords(&location);
@@ -183,9 +183,9 @@ static void parse_dive_location(char *line, struct membuffer *str, void *_dive)
if (!ds) {
ds = get_dive_site_by_name(name);
if (!ds)
- dive->dive_site_uuid = create_dive_site(name, dive->when)->uuid;
+ dive->dive_site = create_dive_site(name, dive->when);
else
- dive->dive_site_uuid = ds->uuid;
+ dive->dive_site = ds;
} else {
// we already had a dive site linked to the dive
if (empty_string(ds->name)) {
@@ -212,7 +212,7 @@ static void parse_dive_notes(char *line, struct membuffer *str, void *_dive)
{ UNUSED(line); struct dive *dive = _dive; dive->notes = get_utf8(str); }
static void parse_dive_divesiteid(char *line, struct membuffer *str, void *_dive)
-{ UNUSED(str); struct dive *dive = _dive; dive->dive_site_uuid = get_hex(line); }
+{ UNUSED(str); struct dive *dive = _dive; dive->dive_site = get_dive_site_by_uuid(get_hex(line)); }
/*
* We can have multiple tags in the membuffer. They are separated by