From 1d468190a6d959499934d0b08ad36f90af726571 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 4 Feb 2020 21:02:22 +0100 Subject: [PATCH] - fixed: parent-less confirmation screens did not process any input. --- source/common/menu/messagebox.cpp | 33 ++++++++++++++----------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/source/common/menu/messagebox.cpp b/source/common/menu/messagebox.cpp index 7f9bc4423..8a60b7d67 100644 --- a/source/common/menu/messagebox.cpp +++ b/source/common/menu/messagebox.cpp @@ -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(); } }