Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup remaining modules on loadexec.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-07-13 20:04:27 -07:00
parent 729377881c
commit ede29179c6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Core/HLE/sceKernelModule.cpp
View File

@ -1449,6 +1449,12 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str
// Wipe kernel here, loadexec should reset the entire system // Wipe kernel here, loadexec should reset the entire system
if (__KernelIsRunning()) if (__KernelIsRunning())
{ {
u32 error;
while (!loadedModules.empty()) {
Module *module = kernelObjects.Get<Module>(*loadedModules.begin(), error);
module->Cleanup();
}
Replacement_Shutdown(); Replacement_Shutdown();
__KernelShutdown(); __KernelShutdown();
//HLE needs to be reset here //HLE needs to be reset here
@ -1634,7 +1640,9 @@ u32 sceKernelLoadModule(const char *name, u32 flags, u32 optionAddr)
if (info.name == "BOOT.BIN") if (info.name == "BOOT.BIN")
{ {
NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name); NOTICE_LOG(LOADER, "Module %s is blacklisted or undecryptable - we try __KernelLoadExec", name);
return __KernelLoadExec(name, 0, &error_string); // Name might get deleted.
const std::string safeName = name;
return __KernelLoadExec(safeName.c_str(), 0, &error_string);
} }
else else
{ {