From f74e29977fb114f91d5c9c2a6bd3baf52befd682 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Wed, 22 Jan 2014 08:17:21 -0800
Subject: [PATCH] Abort on a message dialog just moves to finished.

Still need to shutdown.  Fixes #5177.
---
 Core/Dialog/PSPMsgDialog.cpp | 4 ++--
 Core/HLE/sceUtility.cpp      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp
index 23d36592ba..d3f30494a5 100755
--- a/Core/Dialog/PSPMsgDialog.cpp
+++ b/Core/Dialog/PSPMsgDialog.cpp
@@ -284,8 +284,8 @@ int PSPMsgDialog::Update(int animSpeed)
 
 int PSPMsgDialog::Abort()
 {
-	// TODO: Probably not exactly the same?
-	return PSPDialog::Shutdown();
+	status = SCE_UTILITY_STATUS_FINISHED;
+	return 0;
 }
 
 int PSPMsgDialog::Shutdown(bool force)
diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp
index 1a99bb3bda..83071a4cf6 100644
--- a/Core/HLE/sceUtility.cpp
+++ b/Core/HLE/sceUtility.cpp
@@ -309,10 +309,9 @@ int sceUtilityMsgDialogAbort()
 {
 	if (currentDialogType != UTILITY_DIALOG_MSG)
 	{
-		WARN_LOG(SCEUTILITY, "sceUtilityMsgDialogShutdownStart(): wrong dialog type");
+		WARN_LOG(SCEUTILITY, "sceUtilityMsgDialogAbort(): wrong dialog type");
 		return SCE_ERROR_UTILITY_WRONG_TYPE;
 	}
-	currentDialogActive = false;
 
 	DEBUG_LOG(SCEUTILITY, "sceUtilityMsgDialogAbort()");
 	return msgDialog.Abort();