Skip to content
Permalink
Browse files

- fixed VM abort when entering search menu

  • Loading branch information...
alexey-lysiuk committed Sep 8, 2019
1 parent 06ad607 commit 526a576d89e24da988556dda831b877e79be4689
Showing with 11 additions and 7 deletions.
  1. +11 −7 wadsrc/static/zscript/ui/menu/optionmenu.zs
@@ -107,15 +107,19 @@ class OptionMenu : Menu
mDesc = desc;
DontDim = desc.mDontDim;

let last = mDesc.mItems[mDesc.mItems.size() - 1];
bool lastIsText = (last is "OptionMenuItemStaticText");
if (lastIsText)
let itemCount = mDesc.mItems.size();
if (itemCount > 0)
{
String text = last.mLabel;
bool lastIsSpace = (text == "" || text == " ");
if (lastIsSpace)
let last = mDesc.mItems[itemCount - 1];
bool lastIsText = (last is "OptionMenuItemStaticText");
if (lastIsText)
{
mDesc.mItems.Pop();
String text = last.mLabel;
bool lastIsSpace = (text == "" || text == " ");
if (lastIsSpace)
{
mDesc.mItems.Pop();
}
}
}

0 comments on commit 526a576

Please sign in to comment.
You can’t perform that action at this time.