From df145ca0f391839aefbff7be9fd8353840127d60 Mon Sep 17 00:00:00 2001
From: LogicParrot <LogicParrot@users.noreply.github.com>
Date: Thu, 14 Apr 2016 12:40:46 +0300
Subject: Revert "Issue3136"

---
 src/OverridesSettingsRepository.cpp | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'src/OverridesSettingsRepository.cpp')

diff --git a/src/OverridesSettingsRepository.cpp b/src/OverridesSettingsRepository.cpp
index f3db96a5c..9e85abce6 100644
--- a/src/OverridesSettingsRepository.cpp
+++ b/src/OverridesSettingsRepository.cpp
@@ -108,26 +108,31 @@ 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 ;});
 
-	auto ret = overrides;
+	std::vector<std::pair<AString, AString>> ret;
 
-	for (const auto & mainpair : main)
+
+	size_t overridesIndex = 0;
+	for (auto pair : main)
 	{
-		bool found = false;
-		for (const auto & returnpair : ret)
+		if (overridesIndex >= overrides.size())
+		{
+			ret.push_back(pair);
+			continue;
+		}
+		if (pair.first == overrides[overridesIndex].first)
 		{
-			if (returnpair.first == mainpair.first)
-			{
-				found = true;
-				break;
-			}
+			continue;
 		}
-		if (found == false)
+		while (pair.first > overrides[overridesIndex].first)
 		{
-			ret.push_back(mainpair);
+			ret.push_back(overrides[overridesIndex]);
+			overridesIndex++;
 		}
+		ret.push_back(pair);
 	}
-
 	return ret;
 }
 
@@ -265,3 +270,4 @@ bool cOverridesSettingsRepository::Flush()
 {
 	return m_Overrides->Flush() && m_Main->Flush();
 }
+
-- 
cgit v1.2.3