Merge pull request xbmc#7856 from tamland/preferred_lang_sorting

[lang] sort special values for preferred subtitle/audio language on top
anssih · Aug 20, 2015 · f543ff9 · f543ff9
2 parents 687260f + 607be41
commit f543ff9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/xbmc/LangInfo.cpp b/xbmc/LangInfo.cpp
@@ -1147,13 +1147,16 @@ void CLangInfo::SettingOptionsStreamLanguagesFiller(const CSetting *setting, std
   list.push_back(make_pair(g_localizeStrings.Get(309), "default"));
 
   std::string dummy;
-  SettingOptionsISO6391LanguagesFiller(NULL, list, dummy, NULL);
-  SettingOptionsLanguageNamesFiller(NULL, list, dummy, NULL);
+  std::vector<std::pair<std::string, std::string>> languages;
+  SettingOptionsISO6391LanguagesFiller(NULL, languages, dummy, NULL);
+  SettingOptionsLanguageNamesFiller(NULL, languages, dummy, NULL);
 
-  // convert the vector to a set and back again to remove duplicates
-  std::set<std::pair<std::string, std::string>> languages(list.begin(), list.end());
-  list.assign(languages.begin(), languages.end());
-  std::sort(list.begin(), list.end(), SortLanguage());
+  // convert the vector to a set to remove duplicates
+  std::set<std::pair<std::string, std::string>, SortLanguage> tmp(
+      languages.begin(), languages.end(), SortLanguage());
+
+  list.reserve(list.size() + tmp.size());
+  list.insert(list.end(), tmp.begin(), tmp.end());
 }
 
 void CLangInfo::SettingOptionsRegionsFiller(const CSetting *setting, std::vector< std::pair<std::string, std::string> > &list, std::string &current, void *data)