Skip to content

wiimote: Fix registered Wiimotes unable to get active slot #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2025
Merged

wiimote: Fix registered Wiimotes unable to get active slot #226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions wiiuse/wpad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,6 +938,7 @@ static s8 __wpad_connreqCB(void *arg,struct bd_addr *pad_addr,u8 *cod,u8 link_ty
{
int i, j, level;
int slot = WPAD_MAX_DEVICES;
int confslot = CONF_PAD_MAX_ACTIVE;
struct bd_addr bdaddr;
u8 *name = NULL;

Expand All @@ -947,10 +948,14 @@ static s8 __wpad_connreqCB(void *arg,struct bd_addr *pad_addr,u8 *cod,u8 link_ty
// Only accept connection requests (i.e. "press any button") if not doing guest pairing
if(BTE_GetPairMode() == PAIR_MODE_NORMAL) {
if(!bd_addr_cmp(pad_addr,BD_ADDR_ANY)) {
slot = GetActiveSlot(pad_addr);
if (slot < CONF_PAD_MAX_ACTIVE) {
name = (u8 *)__wpad_devs.active[slot].name;
WIIUSE_DEBUG("Active pad '%s' found in slot %d", name, slot);
confslot = GetActiveSlot(pad_addr);
if (confslot < CONF_PAD_MAX_ACTIVE) {
name = (u8 *)__wpad_devs.active[confslot].name;
WIIUSE_DEBUG("Active pad '%s' found in slot %d", name, confslot);
if (!(__wpads_used & (1<<confslot)))
slot = confslot;
else
WIIUSE_DEBUG("Slot %d taken! Finding new slot", confslot);
}

if(slot >= WPAD_MAX_DEVICES) {
Expand Down