preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 08:46:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix/prevent crashes when MainWindow is closed before LoadFile() completes, or when it gets certain messages before TheThread completes initialization.

Browse Source 
Fix missing ppsspp.ini loading log (only 1 unimportant line though).
Fix loading ui_atlas.zim failure when [General]Browse = True is set in ppsspp.ini.
Some other minor fixes as well.
This commit is contained in:
aquanull
2013-06-15 13:06:43 +08:00
parent ce2c18d2fe
commit bb5fce600e
11 changed files with 144 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/System.cpp
+2 -1
View File
@@ -97,7 +97,8 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
// TODO: Check Game INI here for settings, patches and cheats, and modify coreParameter accordingly
std::string filename = coreParameter.fileToStart;
if (!LoadFile(filename, error_string)) {
if (!LoadFile(filename, error_string) || coreState == CORE_POWERDOWN)
{
pspFileSystem.Shutdown();
CoreTiming::Shutdown();
__KernelShutdown();