From e0e3f396f2c6861242a1b076d07c73da55d40160 Mon Sep 17 00:00:00 2001
From: Alexander Harkness <me@bearbin.net>
Date: Mon, 18 Apr 2016 23:04:13 +0100
Subject: [PATCH] Proper fix for #3136 (#3143)

---
 src/OverridesSettingsRepository.cpp | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/OverridesSettingsRepository.cpp b/src/OverridesSettingsRepository.cpp
index 9e85abce6..607f7c5d0 100644
--- a/src/OverridesSettingsRepository.cpp
+++ b/src/OverridesSettingsRepository.cpp
@@ -108,30 +108,24 @@ std::vector<std::pair<AString, AString>> cOverridesSettingsRepository::GetValues
 {
 	auto overrides = m_Overrides->GetValues(a_keyName);
 	auto main = m_Main->GetValues(a_keyName);
-	std::sort(overrides.begin(), overrides.end(), [](std::pair<AString, AString> a, std::pair<AString, AString> b) -> bool { return a < b ;});
-	std::sort(main.begin(), main.end(), [](std::pair<AString, AString> a, std::pair<AString, AString> b) -> bool { return a < b ;});
 
-	std::vector<std::pair<AString, AString>> ret;
+	auto ret = overrides;
 
-
-	size_t overridesIndex = 0;
-	for (auto pair : main)
+	for (auto mainpair : main)
 	{
-		if (overridesIndex >= overrides.size())
+		bool found = false;
+		for (const auto & overridepair : overrides)
 		{
-			ret.push_back(pair);
-			continue;
+			if (overridepair.first == mainpair.first)
+			{
+				found = true;
+				break;
+			}
 		}
-		if (pair.first == overrides[overridesIndex].first)
+		if (found == false)
 		{
-			continue;
+			ret.push_back(mainpair);
 		}
-		while (pair.first > overrides[overridesIndex].first)
-		{
-			ret.push_back(overrides[overridesIndex]);
-			overridesIndex++;
-		}
-		ret.push_back(pair);
 	}
 	return ret;
 }