mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "prefer download" behavior

Browse source 
When this was first implemented the assumption was that a downloaded dive
that is to be merged with an existing dive would have the same time stamp.
But as Linus pointed out even back then, this does fail if a dive has been
merged with a download from a different dive computer before (think:
download from computer a, then download same dive from b, then improve
something in the parsing from computer a and try to redownload; the time
stamp could have changed).

This commit also fixes a silly omission in the merge_dives() function
(which ended up ALWAYS prefering the downloaded dive) and finally
implements the necessary changes to mark dives downloaded from a Uemis SDA
as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-11-21 15:34:04 -08:00
parent d872a5c8aa
commit 10ce60e212
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
file.c
View file

@ -72,7 +72,7 @@ static void suunto_read(struct zip_file *file, GError **error)
size = read * 3 / 2;
mem = realloc(mem, size);
}
parse_xml_buffer(_("SDE file"), mem, read, error);
parse_xml_buffer(_("SDE file"), mem, read, FALSE, error);
free(mem);
}
#endif
@ -246,7 +246,7 @@ static void parse_file_buffer(const char *filename, struct memblock *mem, GError
if (fmt && open_by_filename(filename, fmt+1, mem, error))
return;
parse_xml_buffer(filename, mem->buffer, mem->size, error);
parse_xml_buffer(filename, mem->buffer, mem->size, FALSE, error);
}
void parse_file(const char *filename, GError **error, gboolean possible_default_filename)