mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Simplify model handling and crashes fixes
So, there's only one crash left (that I put a big TODO: on the maintab.cpp about) and I'll fix it tomorrow as it's quite late here and I'm almost sleeping at the keyboard. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
ee9746c622
commit
6cd85d9b73
6 changed files with 41 additions and 13 deletions
13
divelist.c
13
divelist.c
|
|
@ -341,6 +341,19 @@ int get_divenr(struct dive *dive)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int get_divesite_idx(struct dive_site *ds)
|
||||
{
|
||||
int i;
|
||||
struct dive_site *d;
|
||||
// tempting as it may be, don't die when called with dive=NULL
|
||||
if (ds)
|
||||
for_each_dive_site(i, d) {
|
||||
if (d->uuid == ds->uuid) // don't compare pointers, we could be passing in a copy of the dive
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
static struct gasmix air = { .o2.permille = O2_IN_AIR, .he.permille = 0 };
|
||||
|
||||
/* take into account previous dives until there is a 48h gap between dives */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue