diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2015-01-30 22:40:48 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-30 16:55:20 -0800 |
| commit | 129b54093b38293ede4a88d49432099b98d5eccd (patch) | |
| tree | e9d0acf7724236e374775c0e5ec988c1007bfe59 /dive.c | |
| parent | a6d9a559c1a533dab2b326eac24a41e8c2cdbf9e (diff) | |
| download | subsurface-129b54093b38293ede4a88d49432099b98d5eccd.tar.gz | |
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>
Diffstat (limited to 'dive.c')
| -rw-r--r-- | dive.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |