From e2df38d868324f2a767d2109cdd8727acb866ca2 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 5 Mar 2019 22:58:47 +0100 Subject: Dive site: add dive site ref-counting Instead of setting dive->dive_site directly, call the add_dive_to_dive_site() and unregister_dive_from_dive_site() functions. In the parser this turned out to be a bit tricky. Signed-off-by: Berthold Stoeger --- mobile-widgets/qmlmanager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index b8d83ef5d..d312fac00 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -775,7 +775,8 @@ static void setupDivesite(struct dive *d, struct dive_site *ds, double lat, doub if (ds) { ds->location = location; } else { - d->dive_site = create_dive_site_with_gps(locationtext, &location, &dive_site_table); + unregister_dive_from_dive_site(d); + add_dive_to_dive_site(d, create_dive_site_with_gps(locationtext, &location, &dive_site_table)); } } @@ -894,7 +895,8 @@ bool QMLManager::checkLocation(DiveObjectHelper *myDive, struct dive *d, QString ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); if (!ds && !location.isEmpty()) ds = create_dive_site(qPrintable(location), &dive_site_table); - d->dive_site = ds; + unregister_dive_from_dive_site(d); + add_dive_to_dive_site(d, ds); } // now make sure that the GPS coordinates match - if the user changed the name but not // the GPS coordinates, this still does the right thing as the now new dive site will -- cgit v1.2.3-70-g09d2