From 732afe6a9ebacdf3d325f1afe3d004bccd813fd5 Mon Sep 17 00:00:00 2001
From: nattthebear <goyuken@gmail.com>
Date: Sat, 15 Aug 2020 13:34:23 -0400
Subject: [PATCH] When the frontend ui generates an empty controller bind,
 remove it instead of doing nothing

Fixes #2264
---
 .../config/ControllerConfig/ControllerConfigPanel.cs        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
index 6bbda55929..dbbfb63596 100644
--- a/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
+++ b/src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
@@ -55,7 +55,11 @@ namespace BizHawk.Client.EmuHawk
 				var bindings = _inputs[button].Bindings;
 				if (!string.IsNullOrWhiteSpace(bindings))
 				{
-					saveTo[_buttons[button]] = bindings;
+					saveTo[_buttons[button]] = _inputs[button].Bindings;
+				}
+				else
+				{
+					saveTo.Remove(_buttons[button]);
 				}
 			}
 		}