Merge pull request #357 from lethal-guitar/small-stuff

Robustness: Sort highscore lists after loading/importing

Author: lethal-guitar

src/loader/user_profile_import.cpp

@@ -102,6 +102,10 @@ data::SavedGame loadSavedGame(
 
 
 data::HighScoreList loadHighScoreList(const std::string& filename) {
+  using std::begin;
+  using std::end;
+  using std::sort;
+
   data::HighScoreList list;
 
   const auto data = loadFile(filename);
@@ -112,7 +116,7 @@ data::HighScoreList loadHighScoreList(const std::string& filename) {
     list[i].mScore = std::min<std::uint32_t>(reader.readU32(), data::MAX_SCORE);
   }
 
-  // TODO: Ensure the list is sorted
+  sort(begin(list), end(list));
   return list;
 }
 

src/user_profile.cpp

@@ -244,6 +244,10 @@ void UserProfile::saveToDisk() {
 
 
 void UserProfile::loadFromDisk() {
+  using std::begin;
+  using std::end;
+  using std::sort;
+
   if (!mProfilePath) {
     return;
   }
@@ -289,7 +293,7 @@ void UserProfile::loadFromDisk() {
           }
         }
 
-        // TODO: Ensure the list is sorted
+        sort(begin(mHighScoreLists[i]), end(mHighScoreLists[i]));
 
         ++i;
         if (i >= mHighScoreLists.size()) {