From 02832b7bd6db29f29610dfeb183495d8feafa933 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Wed, 23 Jun 2021 17:52:33 +0200
Subject: [PATCH] Fixed an issue with the PlatformId for Nintendo Switch.

---
 es-app/src/PlatformId.cpp             | 2 +-
 es-app/src/PlatformId.h               | 2 +-
 es-app/src/scrapers/ScreenScraper.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 3b32ddc0e..a10aa4971 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -109,7 +109,7 @@ namespace PlatformIds
         "stratagus",            // Stratagus game engine
         "sufami",               // Bandai SuFami Turbo
         "supergrafx",           // NEC SuperGrafx
-        "switch",               // Nintendo SWITCH
+        "switch",               // Nintendo Switch
         "ti99",                 // Texas Instruments TI-99
         "tic80",                // TIC-80 game engine
         "trs-80",               // Tandy TRS-80
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 3dc470bc5..e8be86f4e 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -109,6 +109,7 @@ namespace PlatformIds
         GAMEENGINE_STRATAGUS,
         BANDAI_SUFAMI_TURBO,
         NEC_SUPERGRAFX,
+        NINTENDO_SWITCH,
         TEXAS_INSTRUMENTS_TI99,
         GAMEENGINE_TIC80,
         TANDY_TRS80,
@@ -127,7 +128,6 @@ namespace PlatformIds
         GAMEENGINE_Z_MACHINE,
         SINCLAIR_ZX81_SINCLAR,
         SINCLAIR_ZX_SPECTRUM,
-        SWITCH,
 
         PLATFORM_IGNORE, // Do not allow scraping for this system.
         PLATFORM_COUNT
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index ed171a39c..01d38b4ff 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -80,6 +80,7 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map {
     { NINTENDO_GAME_AND_WATCH, 52 },
     { NINTENDO_POKEMON_MINI, 211 },
     { NINTENDO_SATELLAVIEW, 107 },
+    { NINTENDO_SWITCH, 225 },
     { BANDAI_SUFAMI_TURBO, 108 },
     { DOS, 135 },
     { PC, 135 },
@@ -107,7 +108,6 @@ const std::map<PlatformId, unsigned short> screenscraper_platformid_map {
     { SONY_PLAYSTATION_PORTABLE, 61 },
     { SAMCOUPE, 213 },
     { SUPER_NINTENDO, 4 },
-    { SWITCH, 225 },
     { NEC_SUPERGRAFX, 105 },
     { GAMEENGINE_TIC80, 222 },
     { NEC_PC_8800, 221},