Menu: Never treat keys with no "Char" as hotkeys.

ZDoom · May 18, 2017 · 8ece6df · 8ece6df
1 parent 4b8f421
commit 8ece6df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/wadsrc/static/zscript/menu/listmenu.txt b/wadsrc/static/zscript/menu/listmenu.txt
@@ -106,11 +106,11 @@ class ListMenu : Menu
 
 	override bool OnUIEvent(UIEvent ev)
 	{
-		if (ev.Type == UIEvent.Type_KeyDown)
+		if (ev.Type == UIEvent.Type_KeyDown && ev.KeyChar > 0)
 		{
 			// tolower
 			int ch = ev.KeyChar;
-			ch = ch >= 65 && ch <91? ch + 32 : ch;
+			ch = ch >= 65 && ch < 91 ? ch + 32 : ch;
 
 			for(int i = mDesc.mSelectedItem + 1; i < mDesc.mItems.Size(); i++)
 			{

diff --git a/wadsrc/static/zscript/menu/listmenuitems.txt b/wadsrc/static/zscript/menu/listmenuitems.txt
@@ -199,7 +199,7 @@ class ListMenuItemSelectable : ListMenuItem
 
 	override bool CheckHotkey(int c)
 	{ 
-		return c == mHotkey; 
+		return c > 0 && c == mHotkey;
 	}
 
 	override bool Activate()