handle lut mode exceptions on apply

1 files changed, 26 insertions, 7 deletions

diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs
index e694dd4..4ce6ed8 100644
--- a/grapher/Models/AccelGUI.cs
+++ b/grapher/Models/AccelGUI.cs
@@ -112,7 +112,7 @@ namespace grapher
             }
         }
 
-        public void UpdateActiveSettingsFromFields()
+        public DriverSettings MakeSettingsFromFields()
         {
             var settings = new DriverSettings();
 
@@ -130,19 +130,38 @@ namespace grapher
 
             Settings.SetHiddenOptions(settings);
 
-            ButtonDelay(WriteButton);
+            return settings;
+        }
 
-            SettingsErrors errors = Settings.TryActivate(settings);
-            if (errors.Empty())
+        public void UpdateActiveSettingsFromFields()
+        {
+            string error_message;
+
+            try
             {
-                RefreshActive();
+                ButtonDelay(WriteButton);
+
+                var settings = MakeSettingsFromFields();
+                SettingsErrors errors = Settings.TryActivate(settings);
+                if (errors.Empty())
+                {
+                    RefreshActive();
+                    return;
+                }
+                else
+                {
+                    error_message = errors.ToString();
+                }
             }
-            else
+            catch (ApplicationException e)
             {
-                new MessageDialog(errors.ToString(), "bad input").ShowDialog();
+                error_message = e.Message;
             }
+
+            new MessageDialog(error_message, "bad input").ShowDialog();
         }
 
+
         public void UpdateInputManagers()
         {
             MouseWatcher.UpdateHandles(Settings.ActiveSettings.baseSettings.deviceID);