diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 0229403531..6ccf85e0bb 100644 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -230,6 +230,12 @@ int PSPMsgDialog::Update() return 0; } +int PSPMsgDialog::Abort() +{ + // TODO: Probably not exactly the same? + return PSPDialog::Shutdown(); +} + int PSPMsgDialog::Shutdown() { return PSPDialog::Shutdown(); diff --git a/Core/Dialog/PSPMsgDialog.h b/Core/Dialog/PSPMsgDialog.h index c9cd38474e..d96a0e389a 100644 --- a/Core/Dialog/PSPMsgDialog.h +++ b/Core/Dialog/PSPMsgDialog.h @@ -61,6 +61,7 @@ public: virtual int Update(); virtual int Shutdown(); virtual void DoState(PointerWrap &p); + int Abort(); private : void DisplayBack(); diff --git a/Core/HLE/sceUtility.cpp b/Core/HLE/sceUtility.cpp index 2246f4d0a3..4c6b40f2d1 100644 --- a/Core/HLE/sceUtility.cpp +++ b/Core/HLE/sceUtility.cpp @@ -245,6 +245,19 @@ int sceUtilityMsgDialogGetStatus() return status; } +int sceUtilityMsgDialogAbort() +{ + if (currentDialogType != UTILITY_DIALOG_MSG) + { + WARN_LOG(HLE, "sceUtilityMsgDialogShutdownStart(): wrong dialog type"); + return SCE_ERROR_UTILITY_WRONG_TYPE; + } + currentDialogActive = false; + + DEBUG_LOG(HLE, "sceUtilityMsgDialogAbort()"); + return msgDialog.Abort(); +} + // On screen keyboard @@ -504,7 +517,7 @@ const HLEFunction sceUtility[] = {0x2ad8e239, &WrapI_U, "sceUtilityMsgDialogInitStart"}, {0x95fc253b, &WrapI_I, "sceUtilityMsgDialogUpdate"}, {0x9a1c91d7, &WrapI_V, "sceUtilityMsgDialogGetStatus"}, - {0x4928bd96, 0, "sceUtilityMsgDialogAbort"}, + {0x4928bd96, &WrapI_V, "sceUtilityMsgDialogAbort"}, {0x9790b33c, &WrapI_V, "sceUtilitySavedataShutdownStart"}, {0x50c4cd57, &WrapI_U, "sceUtilitySavedataInitStart"}, @@ -556,7 +569,7 @@ const HLEFunction sceUtility[] = {0x32E32DCB, 0, "sceUtilityGamedataInstallShutdownStart"}, {0x4AECD179, 0, "sceUtilityGamedataInstallUpdate"}, {0xB57E95D9, &WrapI_V, "sceUtilityGamedataInstallGetStatus"}, - {0x180F7B62, 0, "sceUtilityGamedataInstallAbortFunction"}, + {0x180F7B62, 0, "sceUtilityGamedataInstallAbort"}, {0x16D02AF0, 0, "sceUtilityNpSigninInitStart"}, {0xE19C97D6, 0, "sceUtilityNpSigninShutdownStart"},