diff options
Diffstat (limited to 'grapher/Models/Serialized')
| -rw-r--r-- | grapher/Models/Serialized/RawAccelSettings.cs | 4 | ||||
| -rw-r--r-- | grapher/Models/Serialized/SettingsManager.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs index 17db910..dc4eb0a 100644 --- a/grapher/Models/Serialized/RawAccelSettings.cs +++ b/grapher/Models/Serialized/RawAccelSettings.cs @@ -123,7 +123,7 @@ namespace grapher.Models.Serialized public static bool IsDefaultEquivalent(DriverSettings accelSettings) { bool wholeOrNoY = accelSettings.combineMagnitudes || - accelSettings.modes.y == AccelMode.noaccel; + accelSettings.args.y.mode == AccelMode.noaccel; return string.IsNullOrEmpty(accelSettings.deviceID) && accelSettings.sensitivity.x == 1 && @@ -132,7 +132,7 @@ namespace grapher.Models.Serialized accelSettings.directionalMultipliers.y <= 0 && accelSettings.rotation == 0 && accelSettings.snap == 0 && - accelSettings.modes.x == AccelMode.noaccel && + accelSettings.args.x.mode == AccelMode.noaccel && wholeOrNoY; } diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs index 3773a9e..1a57838 100644 --- a/grapher/Models/Serialized/SettingsManager.cs +++ b/grapher/Models/Serialized/SettingsManager.cs @@ -79,7 +79,7 @@ namespace grapher.Models.Serialized public SettingsErrors TryUpdateAccel(DriverSettings settings) { var errors = SendToDriverSafe(settings); - if (errors.Empty()) ActiveAccel.UpdateFromSettings(settings); + if (errors.Empty()) ActiveAccel.Settings = settings; return errors; } @@ -90,7 +90,7 @@ namespace grapher.Models.Serialized public static SettingsErrors SendToDriverSafe(DriverSettings settings) { - var errors = DriverInterop.GetSettingsErrors(settings); + var errors = new SettingsErrors(settings); if (errors.Empty()) SendToDriver(settings); return errors; } @@ -129,7 +129,7 @@ namespace grapher.Models.Serialized } RawAccelSettings = new RawAccelSettings( - DriverInterop.GetActiveSettings(), + ManagedAccel.GetActive().Settings, MakeGUISettingsFromFields()); RawAccelSettings.Save(); return true; |