Automatically detect console type when we visit Home.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -87,15 +87,9 @@ void ConsoleTypeDetector_StartGameUserSelect::commit_to_cache(){
 }
 
 ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context){
-    go_home(console, context);
-    
-    ConsoleTypeDetector_Home detector(console);
-    ConsoleType console_type = detector.detect_only(console.video().snapshot());
-    detector.commit_to_cache();
-
+    go_home(console, context);  //  Automatically detects console type as well.
     resume_game_from_home(console, context);
-    
-    return console_type;
+    return console.state().console_type();
 }
 
 

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp

@@ -59,6 +59,14 @@ void ensure_at_home(ConsoleHandle& console, ControllerContext& context){
             {home_menu}
         );
         if (ret == 0){
+            //  While we're on the Home screen, we might as well read the
+            //  console type as well.
+            if (console.state().console_type_confirmed()){
+                return;
+            }
+            ConsoleTypeDetector_Home detector(console);
+            detector.detect_only(console.video().snapshot());
+            detector.commit_to_cache();
             return;
         }
         console.log("Unable to detect Home. Pressing Home button...", COLOR_RED);