Merge remote-tracking branch 'upstream/master' into master

1 files changed, 7 insertions, 17 deletions

diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs
index fc58387..c300bde 100644
--- a/grapher/Models/Serialized/SettingsManager.cs
+++ b/grapher/Models/Serialized/SettingsManager.cs
@@ -28,12 +28,10 @@ namespace grapher.Models.Serialized
 
         private ToolStripMenuItem AutoWriteMenuItem { get; set; }
 
-        public void UpdateActiveSettings(DriverSettings settings)
+        public void UpdateActiveSettings(DriverSettings settings, Action afterAccelSettingsUpdate = null)
         {
-            try
+            settings.SendToDriverAndUpdate(ActiveAccel, () =>
             {
-                settings.SendToDriverAndUpdate(ActiveAccel);
-
                 RawAccelSettings.AccelerationSettings = settings;
                 RawAccelSettings.GUISettings = new GUISettings
                 {
@@ -43,23 +41,15 @@ namespace grapher.Models.Serialized
                 };
 
                 RawAccelSettings.Save();
-            }
-            catch (DriverWriteCDException)
-            {
-                Console.WriteLine("write on cooldown");
-            }
+
+                afterAccelSettingsUpdate?.Invoke();
+            });
         }
 
         public void UpdateActiveAccelFromFileSettings(DriverSettings settings)
         {
-            try
-            {
-                settings.SendToDriverAndUpdate(ActiveAccel);
-            }
-            catch (DriverWriteCDException)
-            {
-                Console.WriteLine("write on cd during file init");
-            }
+            settings.SendToDriverAndUpdate(ActiveAccel);
+
             DpiField.SetToEntered(RawAccelSettings.GUISettings.DPI);
             PollRateField.SetToEntered(RawAccelSettings.GUISettings.PollRate);
             AutoWriteMenuItem.Checked = RawAccelSettings.GUISettings.AutoWriteToDriverOnStartup;