[PATCH] Assign lower number to a merged dive instead of higher one
Salvador Cuñat
salvador.cunat at gmail.com
Thu Jan 7 14:21:28 PST 2016
At the moment, if we have, say, dives ... 100, 101 and 102 and we merge 101 and
102, we get a list numbered ... 99, 100, 102. This is, probably, an
undesired behavior. The patch simple chooses lower of both dive numbers instead
of higher one.
Signed-off-by: Salvador Cuñat <salvador.cunat at gmail.com>
---
subsurface-core/dive.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subsurface-core/dive.c b/subsurface-core/dive.c
index f0baf07..9af6379 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);
--
2.7.0.rc3
More information about the subsurface
mailing list