[PATCH] Merge pictures when downloading additional DC
Miika Turkia
miika.turkia at gmail.com
Fri Jan 30 12:40:48 PST 2015
Fixes #822
Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
dive.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/dive.c b/dive.c
index 5732c0f..ce7619e 100644
--- a/dive.c
+++ b/dive.c
@@ -2711,6 +2711,7 @@ struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer
MERGE_MAX(res, a, b, number);
MERGE_NONZERO(res, a, b, cns);
MERGE_NONZERO(res, a, b, visibility);
+ MERGE_NONZERO(res, a, b, picture_list);
taglist_merge(&res->tag_list, a->tag_list, b->tag_list);
merge_equipment(res, a, b);
merge_airtemps(res, a, b);
--
1.9.1
More information about the subsurface
mailing list