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

Process msgdialog abort on Update().

Browse source 
Matches tests.
This commit is contained in:
Unknown W. Brackets 2014-09-27 00:13:11 -07:00
parent 265094f614
commit 00491bb33b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/Dialog/PSPMsgDialog.cpp
View file

@ -218,7 +218,7 @@ int PSPMsgDialog::Update(int animSpeed) {
return SCE_ERROR_UTILITY_INVALID_STATUS; return SCE_ERROR_UTILITY_INVALID_STATUS;
} }
if ((flag & DS_ERROR)) { if (flag & (DS_ERROR | DS_ABORT)) {
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0); ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0);
} else { } else {
UpdateButtons(); UpdateButtons();
@ -290,7 +290,8 @@ int PSPMsgDialog::Abort() {
if (GetStatus() != SCE_UTILITY_STATUS_RUNNING) { if (GetStatus() != SCE_UTILITY_STATUS_RUNNING) {
return SCE_ERROR_UTILITY_INVALID_STATUS; return SCE_ERROR_UTILITY_INVALID_STATUS;
} else { } else {
ChangeStatus(SCE_UTILITY_STATUS_FINISHED, 0); // Status is not actually changed until Update().
flag |= DS_ABORT;
return 0; return 0;
} }
} }

3
Core/Dialog/PSPMsgDialog.h
View file

@ -85,7 +85,8 @@ private :
DS_VALIDBUTTON = 0x20, DS_VALIDBUTTON = 0x20,
DS_CANCELBUTTON = 0x40, DS_CANCELBUTTON = 0x40,
DS_NOSOUND = 0x80, DS_NOSOUND = 0x80,
DS_ERROR = 0x100 DS_ERROR = 0x100,
DS_ABORT = 0x200,
}; };
u32 flag; u32 flag;