diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 1d8ad8d608..51d1d70db3 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -913,8 +913,9 @@ namespace BizHawk.MultiClient public string Right; public string A; public string B; - public string Start; public string Select; + public string Start; + public string Power = ""; public bool Enabled; public GBControllerTemplate() { } public GBControllerTemplate(bool defaults) @@ -930,6 +931,7 @@ namespace BizHawk.MultiClient B = "Z, X1 A"; Start = "Return, X1 Start"; Select = "Space, X1 Back"; + Power = ""; } else { @@ -942,6 +944,7 @@ namespace BizHawk.MultiClient B = ""; Start = ""; Select = ""; + Power = ""; } } } diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index e7da3a2706..d79ae550a7 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -877,6 +877,7 @@ namespace BizHawk.MultiClient gbControls.BindMulti("B", Global.Config.GBController[0].B); gbControls.BindMulti("Select", Global.Config.GBController[0].Select); gbControls.BindMulti("Start", Global.Config.GBController[0].Start); + gbControls.BindMulti("Power", Global.Config.GBController[0].Power); Global.GBControls = gbControls; var agbControls = new AutofireController(Gameboy.GbController); diff --git a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs index e4450b1c3b..261d45e230 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/ControllerConfigPanel.cs @@ -77,7 +77,15 @@ namespace BizHawk.MultiClient { FieldInfo buttonF = ControllerConfigObject.GetType().GetField(buttons[button]); object field = ControllerConfigObject.GetType().GetField(buttons[button]).GetValue(ControllerConfigObject); - Inputs[button].SetBindings(field.ToString()); + + if (field == null) + { + Inputs[button].SetBindings(""); + } + else + { + Inputs[button].SetBindings(field.ToString()); + } } }