aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx/Configuration.cs
diff options
context:
space:
mode:
authoremmauss <emmausssss@gmail.com>2019-08-05 21:58:27 +0300
committerAc_K <Acoustik666@gmail.com>2019-08-05 20:58:27 +0200
commit1ba58e9942e54175e3f3a0e1d57a48537f4888b1 (patch)
treecc33a49301aeea1e2729cbffe823f08a949223bb /Ryujinx/Configuration.cs
parent54b79dffa8eafe9da9765329930e8832ae90ae83 (diff)
Use the Joystick interface for game controller input. (#737)
* switch gamepad input to joystick * fix style nits * modify config.md to reflect new changes
Diffstat (limited to 'Ryujinx/Configuration.cs')
-rw-r--r--Ryujinx/Configuration.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Ryujinx/Configuration.cs b/Ryujinx/Configuration.cs
index 72f507de..c15fff2a 100644
--- a/Ryujinx/Configuration.cs
+++ b/Ryujinx/Configuration.cs
@@ -135,7 +135,7 @@ namespace Ryujinx
/// <summary>
/// Controller control bindings
/// </summary>
- public UI.Input.NpadController GamepadControls { get; private set; }
+ public UI.Input.NpadController JoystickControls { get; private set; }
/// <summary>
/// Loads a configuration file from disk
@@ -246,11 +246,11 @@ namespace Ryujinx
ServiceConfiguration.IgnoreMissingServices = Instance.IgnoreMissingServices;
- if (Instance.GamepadControls.Enabled)
+ if (Instance.JoystickControls.Enabled)
{
- if (GamePad.GetName(Instance.GamepadControls.Index) == "Unmapped Controller")
+ if (!Joystick.GetState(Instance.JoystickControls.Index).IsConnected)
{
- Instance.GamepadControls.SetEnabled(false);
+ Instance.JoystickControls.SetEnabled(false);
}
}