Temporary fix to incorrect Switch detection.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp

@@ -70,7 +70,6 @@ ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect(const ImageViewRGB32
         state = ConsoleType::Switch1;
     }
 
-    m_console.state().set_console_type(m_console, state);
     return state;
 }
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp

@@ -20,7 +20,8 @@ namespace NintendoSwitch{
 
 
 StartGameUserSelectDetector::StartGameUserSelectDetector(ConsoleHandle& console, Color color)
-    : m_type_detector(console, color)
+    : m_console(console)
+    , m_type_detector(console, color)
     , m_switch1(color)
     , m_switch2(color)
 {}
@@ -29,9 +30,10 @@ void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
     m_switch1.make_overlays(items);
     m_switch2.make_overlays(items);
 }
-bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
+bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
     ConsoleType type = m_type_detector.detect(screen);
 //    cout << "detection: " << (int)x << endl;
+    m_console_type = type;
 
     if (type == ConsoleType::Unknown){
         return false;
@@ -48,6 +50,14 @@ bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
         "Invalid ConsoleType: " + std::to_string((int)type)
     );
 }
+bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
+    if (detect_only(screen)){
+        m_console.state().set_console_type(m_console, m_console_type);
+        return true;
+    }else{
+        return false;
+    }
+}
 
 
 

SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h

@@ -59,12 +59,16 @@ class StartGameUserSelectDetector : public StaticScreenDetector{
     StartGameUserSelectDetector(ConsoleHandle& console, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
+    bool detect_only(const ImageViewRGB32& screen);
     virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
+    ConsoleHandle& m_console;
     ConsoleTypeDetector_StartGameUserSelect m_type_detector;
     StartGameUserSelectDetector_Switch1 m_switch1;
     StartGameUserSelectDetector_Switch2 m_switch2;
+
+    ConsoleType m_console_type;
 };
 class StartGameUserSelectWatcher : public DetectorToFinder<StartGameUserSelectDetector>{
 public: