thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure to check current status for changes.

Browse source 
The game may not even call GetStatus(), but the status should still
change.

Also, error when using InitStart() during Shutdown(), per tests.
This commit is contained in:
Unknown W. Brackets 2014-02-08 09:58:31 -08:00
parent 67b1aee1f8
commit 1e8611a756
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Core/Dialog/PSPSaveDialog.cpp
View file

@ -49,8 +49,8 @@ PSPSaveDialog::~PSPSaveDialog() {
int PSPSaveDialog::Init(int paramAddr)
{
// Ignore if already running
if (status != SCE_UTILITY_STATUS_NONE && status != SCE_UTILITY_STATUS_SHUTDOWN) {
ERROR_LOG(SCEUTILITY,"A save request is already running !");
if (GetStatus() != SCE_UTILITY_STATUS_NONE) {
ERROR_LOG_REPORT(SCEUTILITY, "A save request is already running, not starting a new one");
return SCE_ERROR_UTILITY_INVALID_STATUS;
}
@ -543,7 +543,7 @@ void PSPSaveDialog::DisplayMessage(std::string text, bool hasYesNo)
int PSPSaveDialog::Update(int animSpeed)
{
if (status != SCE_UTILITY_STATUS_RUNNING)
if (GetStatus() != SCE_UTILITY_STATUS_RUNNING)
return SCE_ERROR_UTILITY_INVALID_STATUS;
if (!param.GetPspParam()) {
@ -1002,7 +1002,7 @@ int PSPSaveDialog::Update(int animSpeed)
int PSPSaveDialog::Shutdown(bool force)
{
if (status != SCE_UTILITY_STATUS_FINISHED && !force)
if (GetStatus() != SCE_UTILITY_STATUS_FINISHED && !force)
return SCE_ERROR_UTILITY_INVALID_STATUS;
PSPDialog::Shutdown();