From 019eeec93d3399a2e277ff9399320764043e38c1 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Jun 2019 21:36:54 +0200 Subject: Dive merge: don't use unset dive numbers On merging, don't use the number of the first dive if it is 0. Use the first non-zero number. Fixes #2126 Signed-off-by: Berthold Stoeger --- desktop-widgets/command_divelist.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/command_divelist.cpp b/desktop-widgets/command_divelist.cpp index 5a318e8a3..0796c6f5f 100644 --- a/desktop-widgets/command_divelist.cpp +++ b/desktop-widgets/command_divelist.cpp @@ -918,8 +918,13 @@ MergeDives::MergeDives(const QVector &dives) d->divetrip = nullptr; d->dive_site = nullptr; - // The merged dive gets the number of the first dive - d->number = dives[0]->number; + // The merged dive gets the number of the first dive with a non-zero number + for (const dive *dive: dives) { + if (dive->number) { + d->number = dive->number; + break; + } + } // We will only renumber the remaining dives if the joined dives are consecutive. // Otherwise all bets are off concerning what the user wanted and doing nothing seems -- cgit v1.2.3-70-g09d2