From c2b5a1a35cd79597bc5f92f0484862acb45cf1c7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Mon, 13 Oct 2025 21:13:37 -0500 Subject: [PATCH] WiimoteReal: Check just the start of Bluetooth device names to match the test performed by Wii software. --- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 7451c5d02b6..cdf477d8be8 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -1028,12 +1028,14 @@ bool IsValidDeviceName(std::string_view name) bool IsWiimoteName(std::string_view name) { - return name == "Nintendo RVL-CNT-01" || name == "Nintendo RVL-CNT-01-TR"; + // Wii software similarly checks just the start of the name. + return name.starts_with("Nintendo RVL-CNT"); } bool IsBalanceBoardName(std::string_view name) { - return "Nintendo RVL-WBC-01" == name; + // Wii software similarly checks just the start of the name. + return name.starts_with("Nintendo RVL-WBC"); } // This is called from the scanner backends (currently on the scanner thread).