Io: Don't allow async close while async busy.

See hrydgard#6582.
unknownbrackets · Jan 24, 2021 · c7bf68c · c7bf68c
1 parent a88f6b4
commit c7bf68c
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
@@ -2017,20 +2017,22 @@ static int sceIoChangeAsyncPriority(int id, int priority) {
 	return hleLogSuccessI(SCEIO, 0);
 }
 
-static int sceIoCloseAsync(int id)
-{
+static int sceIoCloseAsync(int id) {
 	u32 error;
 	FileNode *f = __IoGetFd(id, error);
-	if (f) {
-		f->closePending = true;
-
-		auto &params = asyncParams[id];
-		params.op = IoAsyncOp::CLOSE;
-		IoStartAsyncThread(id, f);
-		return hleLogSuccessI(SCEIO, 0);
-	} else {
+	if (!f) {
 		return hleLogError(SCEIO, error, "bad file descriptor");
 	}
+	if (f->asyncBusy()) {
+		return hleLogWarning(SCEIO, SCE_KERNEL_ERROR_ASYNC_BUSY, "async busy");
+	}
+
+	f->closePending = true;
+
+	auto &params = asyncParams[id];
+	params.op = IoAsyncOp::CLOSE;
+	IoStartAsyncThread(id, f);
+	return hleLogSuccessI(SCEIO, 0);
 }
 
 static u32 sceIoSetAsyncCallback(int id, u32 clbckId, u32 clbckArg)