From 55146f459f2f5f26dff8a67199970bf5df655bff Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 12 Feb 2023 22:16:47 +0000 Subject: [PATCH] Ensure that SortRailTypes sort is deterministic Use rail type ID as tie-breaker --- src/rail_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 7710f95b14..e9ebadf6af 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -205,9 +205,9 @@ static bool CompareRailTypes(const RailType &first, const RailType &second) } } - return sort_value[0] < sort_value[1]; + return std::tie(sort_value[0], first) < std::tie(sort_value[1], second); } else { - return GetRailTypeInfo(first)->sorting_order < GetRailTypeInfo(second)->sorting_order; + return std::tie(GetRailTypeInfo(first)->sorting_order, first) < std::tie(GetRailTypeInfo(second)->sorting_order, second); } }