zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed: parent-less confirmation screens did not process any input.

This commit is contained in:
Christoph Oelckers 2020-02-04 21:02:22 +01:00
parent 5d4514060b
commit 1d468190a6
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/common/menu/messagebox.cpp
View File

@ -142,27 +142,24 @@ void DMessageBoxMenu::CloseSound()
void DMessageBoxMenu::HandleResult(bool res)
{
if (mParentMenu != NULL)
if (mMessageMode == 0)
{
if (mMessageMode == 0)
if (mActionFunc)
{
if (mActionFunc)
{
mActionFunc(res);
Close();
}
else if (mAction == NAME_None)
{
mParentMenu->MenuEvent(res? MKEY_MBYes : MKEY_MBNo, false);
Close();
}
else
{
Close();
if (res) M_SetMenu(mAction, -1);
}
CloseSound();
mActionFunc(res);
Close();
}
else if (mAction == NAME_None && mParentMenu)
{
mParentMenu->MenuEvent(res ? MKEY_MBYes : MKEY_MBNo, false);
Close();
}
else
{
Close();
if (res) M_SetMenu(mAction, -1);
}
CloseSound();
}
}