diff --git a/Core/HLE/sceNet.cpp b/Core/HLE/sceNet.cpp index 15e5179d5e..448b0ba66e 100644 --- a/Core/HLE/sceNet.cpp +++ b/Core/HLE/sceNet.cpp @@ -676,8 +676,6 @@ static u32 sceWlanGetEtherAddr(u32 addrAddr) { return hleLogError(SCENET, SCE_KERNEL_ERROR_ILLEGAL_ADDR, "illegal address"); } - // FIXME: Return 0x80410180 (pspnet[_core] error code?) when Adhocctl not connected to a group (ie. ADHOCCTL_STATE_DISCONNECTED)? - u8 *addr = Memory::GetPointer(addrAddr); if (PPSSPP_ID > 1) { Memory::Memset(addrAddr, PPSSPP_ID, 6); @@ -697,6 +695,10 @@ static u32 sceWlanGetEtherAddr(u32 addrAddr) { } static u32 sceNetGetLocalEtherAddr(u32 addrAddr) { + // FIXME: Return 0x80410180 (pspnet[_core] error code?) before successful attempt to Create/Connect/Join a Group? (ie. adhocctlCurrentMode == ADHOCCTL_MODE_NONE) + if (adhocctlCurrentMode == ADHOCCTL_MODE_NONE) + return hleLogDebug(SCENET, 0x80410180, "address not available?"); + return sceWlanGetEtherAddr(addrAddr); }