proper handling of None mapping getter and setter

Stephen Hodgson · Stephen Hodgson · commit ad2076470b3f · 2017-10-02T12:45:54.000-07:00
diff --git a/Assets/HoloToolkit/Input/Scripts/GamePad/XboxControllerMapping.cs b/Assets/HoloToolkit/Input/Scripts/GamePad/XboxControllerMapping.cs
@@ -34,6 +34,8 @@ public static string GetMapping(XboxControllerMappingTypes type)
         {
             switch (type)
             {
+                case XboxControllerMappingTypes.None:
+                    return string.Empty;
                 case XboxControllerMappingTypes.XboxLeftStickHorizontal:
                     return XboxLeftStickHorizontal;
                 case XboxControllerMappingTypes.XboxLeftStickVertical:
@@ -81,6 +83,8 @@ public static void SetMapping(XboxControllerMappingTypes type, string value)
         {
             switch (type)
             {
+                case XboxControllerMappingTypes.None:
+                    return;
                 case XboxControllerMappingTypes.XboxLeftStickHorizontal:
                     XboxLeftStickHorizontal = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_HORIZONTAL" : value;
                     break;

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ public static string GetMapping(XboxControllerMappingTypes type)`
`34`	`34`	`{`
`35`	`35`	`switch (type)`
`36`	`36`	`{`
	`37`	`+ case XboxControllerMappingTypes.None:`
	`38`	`+ return string.Empty;`
`37`	`39`	`case XboxControllerMappingTypes.XboxLeftStickHorizontal:`
`38`	`40`	`return XboxLeftStickHorizontal;`
`39`	`41`	`case XboxControllerMappingTypes.XboxLeftStickVertical:`
`@@ -81,6 +83,8 @@ public static void SetMapping(XboxControllerMappingTypes type, string value)`
`81`	`83`	`{`
`82`	`84`	`switch (type)`
`83`	`85`	`{`
	`86`	`+ case XboxControllerMappingTypes.None:`
	`87`	`+ return;`
`84`	`88`	`case XboxControllerMappingTypes.XboxLeftStickHorizontal:`
`85`	`89`	`XboxLeftStickHorizontal = string.IsNullOrEmpty(value) ? "CONTROLLER_LEFT_STICK_HORIZONTAL" : value;`
`86`	`90`	`break;`