Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reset savedata to NONE when stopping emulator.

Browse source 
This way the second game you play won't hang.  Also fixes tests.  Oops.
This commit is contained in:
Unknown W. Brackets 2014-02-08 16:48:40 -08:00
parent 7937c1920d
commit a0262a5263
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Core/Dialog/PSPDialog.cpp
View file

@ -86,7 +86,11 @@ void PSPDialog::EndDraw()
int PSPDialog::Shutdown(bool force)
{
ChangeStatus(SCE_UTILITY_STATUS_SHUTDOWN, 0);
if (force) {
ChangeStatus(SCE_UTILITY_STATUS_NONE, 0);
} else {
ChangeStatus(SCE_UTILITY_STATUS_SHUTDOWN, 0);
}
return 0;
}

6
Core/Dialog/PSPSaveDialog.cpp
View file

@ -1005,8 +1005,10 @@ int PSPSaveDialog::Shutdown(bool force)
if (GetStatus() != SCE_UTILITY_STATUS_FINISHED && !force)
return SCE_ERROR_UTILITY_INVALID_STATUS;
PSPDialog::Shutdown();
ChangeStatusShutdown(SAVEDATA_SHUTDOWN_DELAY_US);
PSPDialog::Shutdown(force);
if (!force) {
ChangeStatusShutdown(SAVEDATA_SHUTDOWN_DELAY_US);
}
param.SetPspParam(0);
return 0;

2
native

@ -1 +1 @@
Subproject commit 527c2cf861b0fff3049d795d48a245e6c3866f49
Subproject commit 0ba62994137392e447570b8f0eef8a819556fd3b