Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash instroduced by #1115 #1117

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Fix crash instroduced by #1115 #1117

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5862a0
Revert "CafeSystem: Init recompiler after game profile has been loade…
goeiecool9999 Mar 11, 2024
6cb0ae7
move gameprofile load call instead
goeiecool9999 Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Cafe/CafeSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,6 @@ namespace CafeSystem
}
}
LoadMainExecutable();
gameProfile_load();
return STATUS_CODE::SUCCESS;
}

Expand Down Expand Up @@ -777,12 +776,13 @@ namespace CafeSystem
STATUS_CODE r = LoadAndMountForegroundTitle(titleId);
if (r != STATUS_CODE::SUCCESS)
return r;
gameProfile_load();
// setup memory space and PPC recompiler
SetupMemorySpace();
PPCRecompiler_init();
r = SetupExecutable(); // load RPX
if (r != STATUS_CODE::SUCCESS)
return r;
PPCRecompiler_init();
InitVirtualMlcStorage();
return STATUS_CODE::SUCCESS;
}
Expand Down Expand Up @@ -821,11 +821,11 @@ namespace CafeSystem
uint32 h = generateHashFromRawRPXData(execData->data(), execData->size());
sForegroundTitleId = 0xFFFFFFFF00000000ULL | (uint64)h;
cemuLog_log(LogType::Force, "Generated placeholder TitleId: {:016x}", sForegroundTitleId);
// setup memory space
// setup memory space and ppc recompiler
SetupMemorySpace();
PPCRecompiler_init();
// load executable
SetupExecutable();
PPCRecompiler_init();
InitVirtualMlcStorage();
return STATUS_CODE::SUCCESS;
}
Expand Down
Loading