Merge branch 'hotfix/1837-speech-config' into develop

EDCD · Jun 22, 2020 · 788104a · 788104a
2 parents 7f30854 + 2c8d64e
commit 788104a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 25 deletions.
diff --git a/EDDI/MainWindow.xaml.cs b/EDDI/MainWindow.xaml.cs
@@ -21,6 +21,7 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using Utilities;
+using ComboBox = System.Windows.Controls.ComboBox;
 
 namespace Eddi
 {
@@ -1008,27 +1009,42 @@ public static bool IsAdministrator()
 
         private void ttsVoiceDropDownUpdated(object sender, SelectionChangedEventArgs e)
         {
-            ttsUpdated();
+            if (sender is FrameworkElement frameworkElement && frameworkElement.IsLoaded)
+            {
+                ttsUpdated();
+            }
         }
 
         private void ttsEffectsLevelUpdated(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            ttsUpdated();
+            if (sender is FrameworkElement frameworkElement && frameworkElement.IsLoaded)
+            {
+                ttsUpdated();
+            }
         }
 
         private void ttsDistortionLevelUpdated(object sender, RoutedEventArgs e)
         {
-            ttsUpdated();
+            if (sender is FrameworkElement frameworkElement && frameworkElement.IsLoaded)
+            {
+                ttsUpdated();
+            }
         }
 
         private void ttsRateUpdated(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            ttsUpdated();
+            if (sender is FrameworkElement frameworkElement && frameworkElement.IsLoaded)
+            {
+                ttsUpdated();
+            }
         }
 
         private void ttsVolumeUpdated(object sender, RoutedPropertyChangedEventArgs<double> e)
         {
-            ttsUpdated();
+            if (sender is FrameworkElement frameworkElement && frameworkElement.IsLoaded)
+            {
+                ttsUpdated();
+            }
         }
 
         private void ttsTestVoiceButtonClicked(object sender, RoutedEventArgs e)
@@ -1072,8 +1088,8 @@ private void ttsUpdated()
                 DisableSsml = disableSsmlCheckbox.IsChecked.Value,
                 EnableIcao = enableIcaoCheckbox.IsChecked.Value
             };
+            SpeechService.Instance.Configuration = speechConfiguration;
             speechConfiguration.ToFile();
-            SpeechService.Instance.ReloadConfiguration();
         }
 
         // Called from the VoiceAttack plugin if the "Configure EDDI" voice command has

diff --git a/SpeechService/SpeechService.cs b/SpeechService/SpeechService.cs
@@ -103,11 +103,6 @@ protected virtual void Dispose(bool disposing)
             }
         }
 
-        public void ReloadConfiguration()
-        {
-            Configuration = SpeechServiceConfiguration.FromFile();
-        }
-
         public void Say(Ship ship, string message, int priority = 3, string voice = null, bool radio = false, string eventType = null, bool invokedFromVA = false)
         {
             if (message == null)

diff --git a/Utilities/Files.cs b/Utilities/Files.cs
@@ -4,7 +4,6 @@
 using System.Security;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 
 namespace Utilities
 {
@@ -102,7 +101,7 @@ private static bool TryRead(string fileName, int attempts, out string result)
         /// </summary>
         /// <param name="fileName"></param>
         /// <param name="content"></param>
-        public static async void Write(string fileName, string content)
+        public static void Write(string fileName, string content)
         {
             if (fileName != null && content != null)
             {
@@ -113,19 +112,16 @@ public static async void Write(string fileName, string content)
                     return;
                 }
 
-                await Task.Run(() =>
+                int attempts = writeAttempts;
+                while (attempts > 0 && TryWrite(fileName, attempts, content))
                 {
-                    int attempts = writeAttempts;
-                    while (attempts > 0 && TryWrite(fileName, attempts, content))
-                    {
-                        attempts--;
-                        Thread.Sleep(writeIODelayMilliseconds);
-                    }
-                    if (attempts == 0)
-                    {
-                        throw new IOException("IO write failed for " + fileName + ", too many attempts.");
-                    }
-                }).ConfigureAwait(false);
+                    attempts--;
+                    Thread.Sleep(writeIODelayMilliseconds);
+                }
+                if (attempts == 0)
+                {
+                    throw new IOException("IO write failed for " + fileName + ", too many attempts.");
+                }
             }
         }