mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile/edit: don't add dive site twice to table

Browse source 
When editing a dive on mobile we might have to create a new
dive site. That site is added to the global dive site table
in the undo command. However, the code in QMLManager created
the dive site with create_dive_site*() functions, which already
adds it to the table. The undo command then added the dive
site again leading to a hang of the application.

To solve this problem, create new alloc_dive_site*()
functions that do the same as create_dive_site*()
but do not add it to the table.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-03-17 21:26:57 +01:00 committed by Dirk Hohndel
parent ccd024f0ee
commit 4bd217299a
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/divesite.c
View file

@ -171,6 +171,21 @@ struct dive_site *alloc_dive_site()
return ds; return ds;
} }
struct dive_site *alloc_dive_site_with_name(const char *name)
{
struct dive_site *ds = alloc_dive_site();
ds->name = copy_string(name);
return ds;
}
struct dive_site *alloc_dive_site_with_gps(const char *name, const location_t *loc)
{
struct dive_site *ds = alloc_dive_site_with_name(name);
ds->location = *loc;
return ds;
}
/* when parsing, dive sites are identified by uuid */ /* when parsing, dive sites are identified by uuid */
struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table) struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table)
{ {
@ -231,8 +246,7 @@ void delete_dive_site(struct dive_site *ds, struct dive_site_table *ds_table)
/* allocate a new site and add it to the table */ /* allocate a new site and add it to the table */
struct dive_site *create_dive_site(const char *name, struct dive_site_table *ds_table) struct dive_site *create_dive_site(const char *name, struct dive_site_table *ds_table)
{ {
struct dive_site *ds = alloc_dive_site(); struct dive_site *ds = alloc_dive_site_with_name(name);
ds->name = copy_string(name);
add_dive_site_to_table(ds, ds_table); add_dive_site_to_table(ds, ds_table);
return ds; return ds;
} }
@ -240,11 +254,8 @@ struct dive_site *create_dive_site(const char *name, struct dive_site_table *ds_
/* same as before, but with GPS data */ /* same as before, but with GPS data */
struct dive_site *create_dive_site_with_gps(const char *name, const location_t *loc, struct dive_site_table *ds_table) struct dive_site *create_dive_site_with_gps(const char *name, const location_t *loc, struct dive_site_table *ds_table)
{ {
struct dive_site *ds = alloc_dive_site(); struct dive_site *ds = alloc_dive_site_with_gps(name, loc);
ds->name = copy_string(name);
ds->location = *loc;
add_dive_site_to_table(ds, ds_table); add_dive_site_to_table(ds, ds_table);
return ds; return ds;
} }

2
core/divesite.h
View file

@ -52,6 +52,8 @@ void sort_dive_site_table(struct dive_site_table *ds_table);
int add_dive_site_to_table(struct dive_site *ds, struct dive_site_table *ds_table); int add_dive_site_to_table(struct dive_site *ds, struct dive_site_table *ds_table);
struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table); struct dive_site *alloc_or_get_dive_site(uint32_t uuid, struct dive_site_table *ds_table);
struct dive_site *alloc_dive_site(); struct dive_site *alloc_dive_site();
struct dive_site *alloc_dive_site_with_name(const char *name);
struct dive_site *alloc_dive_site_with_gps(const char *name, const location_t *loc);
int nr_of_dives_at_dive_site(struct dive_site *ds); int nr_of_dives_at_dive_site(struct dive_site *ds);
bool is_dive_site_selected(struct dive_site *ds); bool is_dive_site_selected(struct dive_site *ds);
void free_dive_site(struct dive_site *ds); void free_dive_site(struct dive_site *ds);

4
mobile-widgets/qmlmanager.cpp
View file

@ -922,7 +922,7 @@ static void setupDivesite(DiveSiteChange &res, struct dive *d, struct dive_site
res.editDs = ds; res.editDs = ds;
res.location = location; res.location = location;
} else { } else {
res.createdDs.reset(create_dive_site_with_gps(locationtext, &location, &dive_site_table)); res.createdDs.reset(alloc_dive_site_with_name(locationtext));
add_dive_to_dive_site(d, res.createdDs.get()); add_dive_to_dive_site(d, res.createdDs.get());
} }
res.changed = true; res.changed = true;
@ -1040,7 +1040,7 @@ bool QMLManager::checkLocation(DiveSiteChange &res, const DiveObjectHelper &myDi
if (myDive.location != location) { if (myDive.location != location) {
ds = get_dive_site_by_name(qPrintable(location), &dive_site_table); ds = get_dive_site_by_name(qPrintable(location), &dive_site_table);
if (!ds && !location.isEmpty()) { if (!ds && !location.isEmpty()) {
res.createdDs.reset(create_dive_site(qPrintable(location), &dive_site_table)); res.createdDs.reset(alloc_dive_site_with_name(qPrintable(location)));
res.changed = true; res.changed = true;
ds = res.createdDs.get(); ds = res.createdDs.get();
} }