From 4a92d0b482c01b4b6f65120a0f8b6e318d51792d Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Thu, 18 May 2023 17:54:42 -0400
Subject: [PATCH] Actually fix fuck ups

---
 .../UI/Models/Input/ControllerInputConfig.cs  | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs b/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
index a1e27025b..6a9323749 100644
--- a/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
+++ b/src/Ryujinx.Ava/UI/Models/Input/ControllerInputConfig.cs
@@ -398,17 +398,6 @@ namespace Ryujinx.Ava.UI.Models.Input
             }
         }
 
-        private MotionInputBackendType _motionBackend;
-        public MotionInputBackendType MotionBackend
-        {
-            get => _motionBackend;
-            set
-            {
-                _motionBackend = value;
-                OnPropertyChanged();
-            }
-        }
-
         private double _gyroDeadzone;
         public double GyroDeadzone
         {
@@ -520,7 +509,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                 if (controllerInput.Motion != null)
                 {
                     EnableMotion = controllerInput.Motion.EnableMotion;
-                    MotionBackend = controllerInput.Motion.MotionBackend;
                     GyroDeadzone = controllerInput.Motion.GyroDeadzone;
                     Sensitivity = controllerInput.Motion.Sensitivity;
 
@@ -598,13 +586,6 @@ namespace Ryujinx.Ava.UI.Models.Input
                     WeakRumble = WeakRumble,
                     StrongRumble = StrongRumble
                 },
-                Motion = new MotionConfigController
-                {
-                    EnableMotion = EnableMotion,
-                    MotionBackend = MotionBackend,
-                    GyroDeadzone = GyroDeadzone,
-                    Sensitivity = Sensitivity,
-                },
                 Version = InputConfig.CurrentVersion,
                 DeadzoneLeft = DeadzoneLeft,
                 DeadzoneRight = DeadzoneRight,
@@ -615,13 +596,28 @@ namespace Ryujinx.Ava.UI.Models.Input
 
             if (EnableCemuHookMotion)
             {
-                var cemuHook = (CemuHookMotionConfigController)config.Motion;
-                cemuHook.DsuServerHost = DsuServerHost;
-                cemuHook.DsuServerPort = DsuServerPort;
-                cemuHook.Slot = Slot;
-                cemuHook.AltSlot = AltSlot;
-                cemuHook.MirrorInput = MirrorInput;
-                config.Motion = cemuHook;
+                config.Motion = new CemuHookMotionConfigController
+                {
+                    EnableMotion = EnableMotion,
+                    MotionBackend = MotionInputBackendType.CemuHook,
+                    GyroDeadzone = GyroDeadzone,
+                    Sensitivity = Sensitivity,
+                    DsuServerHost = DsuServerHost,
+                    DsuServerPort = DsuServerPort,
+                    Slot = Slot,
+                    AltSlot = AltSlot,
+                    MirrorInput = MirrorInput
+                };
+            }
+            else
+            {
+               config.Motion = new MotionConfigController
+                {
+                    EnableMotion = EnableMotion,
+                    MotionBackend = MotionInputBackendType.GamepadDriver,
+                    GyroDeadzone = GyroDeadzone,
+                    Sensitivity = Sensitivity
+                };
             }
 
             return config;