diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-11-21 15:34:04 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-11-21 15:34:04 -0800 |
| commit | 10ce60e2120419282ff7694e8deda60e94832aa1 (patch) | |
| tree | 6ea6a96da0b4209879e20b429672ae73b79a8ebb /gtk-gui.c | |
| parent | d872a5c8aab858fa7a06b6f91f2dda57a43a6306 (diff) | |
| download | subsurface-10ce60e2120419282ff7694e8deda60e94832aa1.tar.gz | |
Fix "prefer download" behavior
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>
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1685,7 +1685,7 @@ static GError *setup_uemis_import(device_data_t *data) #if UEMIS_DEBUG > 3 fprintf(debugfile, "xml buffer \"%s\"\n\n", buf); #endif - parse_xml_buffer("Uemis Download", buf, strlen(buf), &error); + parse_xml_buffer("Uemis Download", buf, strlen(buf), TRUE, &error); set_uemis_last_dive(uemis_max_dive_data); #if UEMIS_DEBUG > 2 fprintf(debugfile, "uemis_max_dive_data: %s\n", uemis_max_dive_data); |