Index: Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs =================================================================== diff -u -r4ec692ae375eea04cf4e4ee028d719476b20c9bb -rf46c8c7a6ec4924d8e1298fc06ca1d77bcb7e3bb --- Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs (.../CalculationsDisplayNameHelper.cs) (revision 4ec692ae375eea04cf4e4ee028d719476b20c9bb) +++ Riskeer/Common/src/Riskeer.Common.Forms/Helpers/CalculationsDisplayNameHelper.cs (.../CalculationsDisplayNameHelper.cs) (revision f46c8c7a6ec4924d8e1298fc06ca1d77bcb7e3bb) @@ -128,21 +128,19 @@ IList> elementsWithSameDisplayNameAsFirstElement = nonUniqueDisplayNameLookup.Where(e => e.Value.Equals(firstElement.Value)) .ToList(); + uniqueDisplayNameLookup.Add(firstElement.Key, firstElement.Value); + nonUniqueDisplayNameLookup.Remove(firstElement.Key); + if (elementsWithSameDisplayNameAsFirstElement.Count > 1) { - for (var i = 0; i < elementsWithSameDisplayNameAsFirstElement.Count; i++) + for (var i = 1; i < elementsWithSameDisplayNameAsFirstElement.Count; i++) { KeyValuePair elementWithNonUniqueDisplayName = elementsWithSameDisplayNameAsFirstElement.ElementAt(i); - uniqueDisplayNameLookup.Add(elementWithNonUniqueDisplayName.Key, elementWithNonUniqueDisplayName.Value + $" ({i + 1})"); + uniqueDisplayNameLookup.Add(elementWithNonUniqueDisplayName.Key, elementWithNonUniqueDisplayName.Value + $" ({i})"); nonUniqueDisplayNameLookup.Remove(elementWithNonUniqueDisplayName.Key); } } - else - { - uniqueDisplayNameLookup.Add(firstElement.Key, firstElement.Value); - nonUniqueDisplayNameLookup.Remove(firstElement.Key); - } } return uniqueDisplayNameLookup;