- fixed: OptionMenuItemSafeCommand did not allow unsafe commands.

This commit is contained in:
Christoph Oelckers 2019-03-30 09:25:48 +01:00
parent 3e8395ddaf
commit f48e0280d8

View file

@ -179,7 +179,7 @@ class OptionMenuItemCommand : OptionMenuItemSubmenu
override bool Activate() override bool Activate()
{ {
// This needs to perform a few checks to prevent abuse by malicious modders. // This needs to perform a few checks to prevent abuse by malicious modders.
if (GetClass() != "OptionMenuItemSafeCommand") if (GetClass() != "OptionMenuItemSafeCommand")
{ {
let m = OptionMenu(Menu.GetCurrentMenu()); let m = OptionMenu(Menu.GetCurrentMenu());
@ -188,6 +188,7 @@ class OptionMenuItemCommand : OptionMenuItemSubmenu
// don't execute if this item cannot be found in the current menu. // don't execute if this item cannot be found in the current menu.
if (m.GetItem(mAction) != self) return false; if (m.GetItem(mAction) != self) return false;
} }
else mUnsafe = false;
Menu.MenuSound("menu/choose"); Menu.MenuSound("menu/choose");
DoCommand(ccmd, mUnsafe); DoCommand(ccmd, mUnsafe);
if (mCloseOnSelect) if (mCloseOnSelect)