From 3cccaabe43a8a585ae94d72ee006f1c03f95f832 Mon Sep 17 00:00:00 2001
From: Brian <bp2008@users.noreply.github.com>
Date: Mon, 23 Apr 2018 15:04:04 -0600
Subject: [PATCH] Fixed a user-reported bug in the hotkey handler that I dont
 know how to reproduce.

---
 ui3/ui3.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ui3/ui3.js b/ui3/ui3.js
index 1c63fc2..e68c3f1 100644
--- a/ui3/ui3.js
+++ b/ui3/ui3.js
@@ -13245,9 +13245,9 @@ function BI_Hotkeys()
 	var currentlyDownKeys = {};
 	$(document).keydown(function (e)
 	{
-		if ($("body").children(".dialog_overlay").length != 0)
+		var charCode = e.which;
+		if ($("body").children(".dialog_overlay").length != 0 || !charCode)
 			return;
-		var charCode = e.which ? e.which : event.keyCode;
 		var hotkeysBeingRepeated = currentlyDownKeys[charCode];
 		if (hotkeysBeingRepeated)
 		{
@@ -13308,7 +13308,9 @@ function BI_Hotkeys()
 	});
 	$(document).keyup(function (e)
 	{
-		var charCode = e.which ? e.which : event.keyCode;
+		var charCode = e.which;
+		if (!charCode)
+			return;
 		var hotkeysBeingReleased = currentlyDownKeys[charCode];
 		currentlyDownKeys[charCode] = false;
 		var retVal = true;