From 129b54093b38293ede4a88d49432099b98d5eccd Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Fri, 30 Jan 2015 22:40:48 +0200
Subject: Merge pictures when downloading additional DC

Fixes #822

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 dive.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dive.c b/dive.c
index 5732c0f83..ce7619e85 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);
-- 
cgit v1.2.3-70-g09d2