Merge pull request #46 from a1xd/1.3

2 files changed, 4 insertions, 31 deletions

diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs
index af87a65..dcaf864 100644
--- a/grapher/Models/Serialized/RawAccelSettings.cs
+++ b/grapher/Models/Serialized/RawAccelSettings.cs
@@ -127,6 +127,8 @@ namespace grapher.Models.Serialized
 
             return accelSettings.sensitivity.x == 1 &&
                 accelSettings.sensitivity.y == 1 &&
+                accelSettings.directionalMultipliers.x <= 0 &&
+                accelSettings.directionalMultipliers.y <= 0 &&
                 accelSettings.rotation == 0 &&
                 accelSettings.modes.x == AccelMode.noaccel &&
                 wholeOrNoY;
diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index f13ba81..41ebcb5 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -34,9 +34,9 @@ namespace grapher.Models.Serialized
 
         public RawAccelSettings RawAccelSettings { get; private set; }
 
-        private Field DpiField { get; set; }
+        public Field DpiField { get; private set; }
 
-        private Field PollRateField { get; set; }
+        public Field PollRateField { get; private set; }
 
         private ToolStripMenuItem AutoWriteMenuItem { get; set; }
 
@@ -47,35 +47,6 @@ namespace grapher.Models.Serialized
         #endregion Properties
 
         #region Methods
-
-        public static string ErrorStringFrom(SettingsErrors errors)
-        {
-            StringBuilder builder = new StringBuilder();
-            bool yPresent = errors.y?.Count > 0;
-
-            if (yPresent)
-            {
-                builder.AppendLine("\nx:");
-            }
-
-            foreach (var error in errors.x)
-            {
-                builder.AppendLine(error);
-            }
-
-            if (yPresent)
-            {
-                builder.AppendLine("\ny:");
-
-                foreach (var error in errors.y)
-                {
-                    builder.AppendLine(error);
-                }
-            }
-
-            return builder.ToString();
-        }
-
         public SettingsErrors TryUpdateActiveSettings(DriverSettings settings)
         {
             var errors = TryUpdateAccel(settings);