Merge pull request #14673 from tommywaaf/android-dolphinbar-balance-board

Android: Route DolphinBar Balance Board to the Balance Board slot

1 files changed, 6 insertions, 4 deletions

diff --git a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
index e82f389a21..5e201d6ac2 100644
--- a/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
+++ b/Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
@@ -46,10 +46,12 @@ auto WiimoteScannerAndroid::FindAttachedWiimotes() -> FindResults
       if (!wiimote->ConnectInternal())
         continue;
 
-      // TODO: We make no attempt to differentiate balance boards here.
-      // wiimote->IsBalanceBoard() would probably be enough to do that.
-
-      results.wii_remotes.emplace_back(std::move(wiimote));
+      // Differentiate balance boards so they are routed to the balance
+      // board results rather than being treated as a regular Wii Remote.
+      if (wiimote->IsBalanceBoard())
+        results.balance_boards.emplace_back(std::move(wiimote));
+      else
+        results.wii_remotes.emplace_back(std::move(wiimote));
     }
   }