Merge pull request #8350 from unknownbrackets/net-minor

Net: don't double-delete thread on shutdown
hrydgard · Jan 1, 2016 · 03d0d83 · 03d0d83
2 parents 4d5ee69 + 7b217af
commit 03d0d83
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Core/HLE/sceNetAdhoc.cpp b/Core/HLE/sceNetAdhoc.cpp
@@ -82,6 +82,9 @@ void __NetAdhocShutdown() {
 		sceNetAdhocctlTerm();
 	}
 	if (netAdhocInited) {
+		// Should not really call HLE funcs from shutdown.
+		// Prevent attempting to delete the thread, already deleted by shutdown.
+		threadAdhocID = 0;
 		sceNetAdhocTerm();
 	}
 	if (dummyThreadHackAddr) {