From c2096d9a309fe0853effa1cdab8bde6b0ee3dd3d Mon Sep 17 00:00:00 2001
From: pjgat09 <pjgat09@gmail.com>
Date: Sun, 7 Dec 2014 07:39:01 +0000
Subject: [PATCH] Lua: Fixed a bug with analog controls not being cleared

---
 .../lua/EmuLuaLibrary.Joypad.cs               | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
index 57cc1679c1..350b3b967c 100644
--- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
+++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Joypad.cs
@@ -172,23 +172,24 @@ namespace BizHawk.Client.Common
 				foreach (var name in controls.Keys)
 				{
 					var theValueStr = controls[name].ToString();
+					float? theValue = null;
 
 					if (!String.IsNullOrWhiteSpace(theValueStr))
 					{
-						try
-						{
-							var theValue = float.Parse(theValueStr);
-							if (controller == null)
-							{
-								Global.StickyXORAdapter.SetFloat(name.ToString(), theValue);
-							}
-							else
-							{
-								Global.StickyXORAdapter.SetFloat("P" + controller + " " + name, theValue);
-							}
-						}
-						catch { }
+						float f;
+						if (float.TryParse(theValueStr, out f))
+							theValue = f;
 					}
+
+					if (controller == null)
+					{
+						Global.StickyXORAdapter.SetFloat(name.ToString(), theValue);
+					}
+					else
+					{
+						Global.StickyXORAdapter.SetFloat("P" + controller + " " + name, theValue);
+					}
+
 				}
 			}
 			catch { /*Eat it*/ }