Merge pull request #13925 from ANR2ME/adhoc

Fix Stuck issue on some games when Failed to connect to Adhoc Server (faked success)
hrydgard · Jan 16, 2021 · 0e4b478 · 0e4b478
2 parents e51317e + 23efd22
commit 0e4b478
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
@@ -300,15 +300,16 @@ static void __AdhocctlNotify(u64 userdata, int cyclesLate) {
 				CoreTiming::ScheduleEvent(usToCycles(500) - cyclesLate, adhocctlNotifyEvent, userdata);
 				return;
 			}
-			else
+			else if (req.opcode != OPCODE_LOGIN)
 				result = ERROR_NET_ADHOCCTL_BUSY;
 		}
 	}
 	else
 		result = ERROR_NET_ADHOCCTL_WLAN_SWITCH_OFF;
 
+	u32 waitVal = __KernelGetWaitValue(threadID, error);
 	__KernelResumeThreadFromWait(threadID, result);
-	DEBUG_LOG(SCENET, "Returning (WaitID: %d, error: %d) Result (%08x) of sceNetAdhocctl - State: %d", waitID, error, (int)result, adhocctlState);
+	DEBUG_LOG(SCENET, "Returning (WaitID: %d, error: %d) Result (%08x) of sceNetAdhocctl - Opcode: %d, State: %d", waitID, error, (int)result, waitVal, adhocctlState);
 
 	// We are done with this request
 	adhocctlRequests.erase(uid);