Merge branch 'master' into recently-played-mobile-clipping

RetroAchievements · Nov 24, 2023 · 2a8bc86 · 2a8bc86
2 parents 0a86b01 + 438d5bc
commit 2a8bc86
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/Helpers/database/achievement.php b/app/Helpers/database/achievement.php
@@ -415,7 +415,7 @@ function updateAchievementFlag(int|string|array $achID, int $newFlag): void
 
     $achievements->update(['Flags' => $newFlag]);
 
-    $updatedAchievements = $achievements->get();
+    $updatedAchievements = Achievement::whereIn('ID', $achievementIDs)->get();
 
     foreach ($updatedAchievements as $achievement) {
         if ($newFlag === AchievementFlag::OfficialCore) {

diff --git a/resources/views/components/menu/main.blade.php b/resources/views/components/menu/main.blade.php
@@ -48,6 +48,10 @@
             ["systemName" => "PC-8000/8800", "listID" => 47],
             ["systemName" => "PC-FX", "listID" => 49],
         ],
+        "SNK" => [
+            ["systemName" => "Neo Geo CD", "listID" => 56],
+            ["systemName" => "Neo Geo Pocket", "listID" => 14],
+        ],
     ],
     [
         "Other" => [
@@ -65,8 +69,6 @@
             ["systemName" => "Magnavox Odyssey 2", "listID" => 23],
             ["systemName" => "Mega Duck", "listID" => 69],
             ["systemName" => "MSX", "listID" => 29],
-            ["systemName" => "Neo Geo CD", "listID" => 56],
-            ["systemName" => "Neo Geo Pocket", "listID" => 14],
             ["systemName" => "Uzebox", "listID" => 80],
             ["systemName" => "Vectrex", "listID" => 46],
             ["systemName" => "WASM-4", "listID" => 72],