From 1e8611a756ba46900d68fcf28f34aa5eb800fa78 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 8 Feb 2014 09:58:31 -0800 Subject: [PATCH] Make sure to check current status for changes. The game may not even call GetStatus(), but the status should still change. Also, error when using InitStart() during Shutdown(), per tests. --- Core/Dialog/PSPSaveDialog.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index fe8f6560bc..0b1bdd7a23 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -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();