From 2b6a573c3be1cbfb7ce0e192d9ce0a5d3e2e9ee3 Mon Sep 17 00:00:00 2001 From: ANR2ME Date: Thu, 8 Oct 2020 01:46:55 +0700 Subject: [PATCH] Prevent getting too many Kernel Errors in the log during a Shutdown cleanups due to kernelObjects already cleared. --- Core/HLE/sceNetAdhoc.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp index fdb7b7ac95..91ab7a6c96 100644 --- a/Core/HLE/sceNetAdhoc.cpp +++ b/Core/HLE/sceNetAdhoc.cpp @@ -2215,12 +2215,13 @@ int NetAdhocctl_Term() { shutdown(metasocket, SD_BOTH); closesocket(metasocket); metasocket = (int)INVALID_SOCKET; - // Delete fake PSP Thread - if (threadAdhocID != 0) { + // Delete fake PSP Thread. + // kernelObjects may already been cleared early during a Shutdown, thus trying to access it may generates Warning/Error in the log + if (threadAdhocID > 0 && strcmp(__KernelGetThreadName(threadAdhocID), "ERROR") != 0) { __KernelStopThread(threadAdhocID, SCE_KERNEL_ERROR_THREAD_TERMINATED, "AdhocThread stopped"); __KernelDeleteThread(threadAdhocID, SCE_KERNEL_ERROR_THREAD_TERMINATED, "AdhocThread deleted"); - threadAdhocID = 0; } + threadAdhocID = 0; adhocctlCurrentMode = ADHOCCTL_MODE_NONE; netAdhocctlInited = false; } @@ -4016,15 +4017,11 @@ int NetAdhocMatching_Stop(int matchingId) { item->eventThread.join(); } - // Stop fake PSP Thread - if (matchingThreads[item->matching_thid] > 0) { + // Stop fake PSP Thread. + // kernelObjects may already been cleared early during a Shutdown, thus trying to access it may generates Warning/Error in the log + if (matchingThreads[item->matching_thid] > 0 && strcmp(__KernelGetThreadName(matchingThreads[item->matching_thid]), "ERROR") != 0) { __KernelStopThread(matchingThreads[item->matching_thid], SCE_KERNEL_ERROR_THREAD_TERMINATED, "AdhocMatching stopped"); __KernelDeleteThread(matchingThreads[item->matching_thid], SCE_KERNEL_ERROR_THREAD_TERMINATED, "AdhocMatching deleted"); - /*item->matchingThread->Terminate(); - if (item->matchingThread && item->matchingThread->Stopped()) { - delete item->matchingThread; - item->matchingThread = nullptr; - }*/ } matchingThreads[item->matching_thid] = 0;