diff options
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -167,8 +167,8 @@ void report_dives(gboolean is_imported, gboolean prefer_imported) /* only try to merge overlapping dives - or if one of the dives has * zero duration (that might be a gps marker from the webservice) */ - if (prev->duration.seconds && dive->duration.seconds && - prev->when + prev->duration.seconds < dive->when) + if (prev->dc.duration.seconds && dive->dc.duration.seconds && + prev->when + prev->dc.duration.seconds < dive->when) continue; merged = try_to_merge(prev, dive, prefer_imported); @@ -184,6 +184,7 @@ void report_dives(gboolean is_imported, gboolean prefer_imported) add_single_dive(i, merged); delete_single_dive(i+1); delete_single_dive(i+1); + mark_divelist_changed(TRUE); } /* make sure no dives are still marked as downloaded */ for (i = 1; i < dive_table.nr; i++) @@ -198,7 +199,6 @@ void report_dives(gboolean is_imported, gboolean prefer_imported) if (preexisting != dive_table.nr) mark_divelist_changed(TRUE); } - dive_table.preexisting = dive_table.nr; dive_list_update_dives(); } |