From 45f8512f8eff99dd7e92e3ab4440d250a7de5dbf Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Thu, 26 Apr 2018 11:40:16 -0500
Subject: [PATCH] Fix clearing keys for control in Team Arena UI

When a control is selected for binding a key, pressing backspace would
clear the displayed keys in the menu but not actually unbind the keys.
---
 code/ui/ui_shared.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/ui/ui_shared.c b/code/ui/ui_shared.c
index aa8489d3..c97fc59b 100644
--- a/code/ui/ui_shared.c
+++ b/code/ui/ui_shared.c
@@ -3547,8 +3547,14 @@ qboolean Item_Bind_HandleKey(itemDef_t *item, int key, qboolean down) {
 			case K_BACKSPACE:
 				id = BindingIDFromName(item->cvar);
 				if (id != -1) {
-					g_bindings[id].bind1 = -1;
-					g_bindings[id].bind2 = -1;
+					if( g_bindings[id].bind1 != -1 ) {
+						DC->setBinding( g_bindings[id].bind1, "" );
+						g_bindings[id].bind1 = -1;
+					}
+					if( g_bindings[id].bind2 != -1 ) {
+						DC->setBinding( g_bindings[id].bind2, "" );
+						g_bindings[id].bind2 = -1;
+					}
 				}
 				Controls_SetConfig(qtrue);
 				g_waitingForKey = qfalse;