The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-11-22 09:09:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash introduced by #1115 (#1117)

Browse Source 
* Revert "CafeSystem: Init recompiler after game profile has been loaded (#1115)"
* Instead move gameprofile load call
This commit is contained in:
goeiecool9999 2024-03-11 02:40:47 +01:00 committed by GitHub
parent ccabd93159
commit bb88b5c36d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Cafe/CafeSystem.cpp
View File

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