diff options
Diffstat (limited to 'subsurface-core/dive.c')
| -rw-r--r-- | subsurface-core/dive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subsurface-core/dive.c b/subsurface-core/dive.c index f0baf076a..9af63791a 100644 --- a/subsurface-core/dive.c +++ b/subsurface-core/dive.c @@ -2856,7 +2856,7 @@ struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer MERGE_TXT(res, a, b, divemaster); MERGE_MAX(res, a, b, rating); MERGE_TXT(res, a, b, suit); - MERGE_MAX(res, a, b, number); + MERGE_MIN(res, a, b, number); MERGE_NONZERO(res, a, b, cns); MERGE_NONZERO(res, a, b, visibility); MERGE_NONZERO(res, a, b, picture_list); |