Skip to content
Permalink
Browse files

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

Also sneak in a small change in logging.
  • Loading branch information
hrydgard committed Jan 12, 2020
1 parent a881d78 commit e2845363e91eb394a6aa3ef56b5b2cc447abc7e4
Showing with 3 additions and 3 deletions.
  1. +1 −1 Core/ELF/PBPReader.cpp
  2. +2 −2 Core/HLE/sceIo.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);
@@ -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;

0 comments on commit e284536

Please sign in to comment.
You can’t perform that action at this time.