Async I/O: Don't delay on close. Fixes #12549 (MGS:PW crash).

Also sneak in a small change in logging.
hrydgard · Jan 12, 2020 · e284536 · e284536
1 parent a881d78
commit e284536
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Core/ELF/PBPReader.cpp b/Core/ELF/PBPReader.cpp
@@ -37,7 +37,7 @@ PBPReader::PBPReader(FileLoader *fileLoader) : file_(nullptr), header_(), isELF_
 	}
 	if (memcmp(header_.magic, "\0PBP", 4) != 0) {
 		if (memcmp(header_.magic, "\nFLE", 4) != 0) {
-			DEBUG_LOG(LOADER, "%s: File actually an ELF, not a PBP", fileLoader->Path().c_str());
+			VERBOSE_LOG(LOADER, "%s: File actually an ELF, not a PBP", fileLoader->Path().c_str());
 			isELF_ = true;
 		} else {
 			ERROR_LOG(LOADER, "Magic number in %s indicated no PBP: %s", fileLoader->Path().c_str(), header_.magic);

diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
@@ -2719,8 +2719,8 @@ static int IoAsyncFinish(int id) {
 
 		case IoAsyncOp::CLOSE:
 			f->asyncResult = 0;
-			// TODO: Rough estimate.
-			us = 100;
+			// CLOSE shouldn't have a delay. See #12549.
+			us = 0;
 			DEBUG_LOG(SCEIO, "ASYNC %lli = sceIoCloseAsync(%d)", f->asyncResult, id);
 			break;