Revert double initialization fix for Speech responder (this fix broke personality change event handling)

Author: Tkael

SpeechResponder/ConfigurationWindow.xaml.cs

@@ -8,7 +8,6 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -84,28 +83,27 @@ private static AvalonEdit.CottleHighlighting GetHighlighting ( IEnumerable<MetaV
             );
         }
 
-        public ConfigurationWindow()
+        public ConfigurationWindow(SpeechResponder speechResponder)
         {
-            var speechResponder = EDDI.Instance.ObtainResponder( Properties.SpeechResponder.ResourceManager.GetString( "name", CultureInfo.InvariantCulture ) );
             if (speechResponder is null) { return; }
-            SpeechResponder = (SpeechResponder)speechResponder;
+            this.SpeechResponder = speechResponder;
             customFunctionNames = ScriptResolver.GetCustomFunctions().Select( f => f.name );
-            DataContext = speechResponder;
             Task.Run( GetStandardVariables );
 
             InitializeComponent();
+            DataContext = speechResponder;
 
             // Set up the scripts view
-            InitializeView( SpeechResponder.CurrentPersonality.Scripts.Values);
+            InitializeView(speechResponder.CurrentPersonality.Scripts.Values);
 
             // Set up other preferences
-            subtitlesCheckbox.IsChecked = SpeechResponder.Configuration?.Subtitles ?? false;
-            subtitlesOnlyCheckbox.IsChecked = SpeechResponder.Configuration?.SubtitlesOnly ?? false;
+            subtitlesCheckbox.IsChecked = speechResponder.Configuration?.Subtitles ?? false;
+            subtitlesOnlyCheckbox.IsChecked = speechResponder.Configuration?.SubtitlesOnly ?? false;
 
             SpeechResponder.PersonalityChanged += PersonalityChanged;
-            SpeechResponder.Personalities.CollectionChanged += PersonalitiesCollectionChanged;
+            speechResponder.Personalities.CollectionChanged += PersonalitiesCollectionChanged;
 
-            CheckForScriptRecovery( SpeechResponder );
+            CheckForScriptRecovery(speechResponder);
         }
 
         private void CheckForScriptRecovery (SpeechResponder speechResponder)
@@ -327,27 +325,26 @@ private void deleteScript(object sender, RoutedEventArgs e)
             var messageBoxText = string.Format(Properties.SpeechResponder.delete_script_message, script.Name);
             var caption = Properties.SpeechResponder.delete_script_caption;
             var result = MessageBox.Show(messageBoxText, caption, MessageBoxButton.YesNo, MessageBoxImage.Warning);
-            if ( result == MessageBoxResult.Yes )
+            switch (result)
             {
-                // Remove the script from the list
-                SpeechResponder.CurrentPersonality.Scripts.Remove( script.Name );
+                case MessageBoxResult.Yes:
+                    // Remove the script from the list
+                    SpeechResponder.CurrentPersonality.Scripts.Remove( script.Name );
 
-                // Remove any references to the removed script in the `includes` scring of other scripts
-                SpeechResponder.CurrentPersonality.Scripts.AsParallel().ForAll( kv =>
-                    kv.Value.includes = kv.Value.includes is null
-                        ? string.Empty
-                        : string.Join( "; ",
-                            kv.Value.includes.Split( ';' ).Select( s => s.Trim() )
-                                .Except( [ script.Name ] ) ) );
+                    // Remove any references to the removed script in the `includes` scring of other scripts
+                    SpeechResponder.CurrentPersonality.Scripts.AsParallel().ForAll( kv =>
+                        kv.Value.includes = kv.Value.includes is null
+                            ? string.Empty
+                            : string.Join( "; ",
+                                kv.Value.includes.Split( ';' ).Select( s => s.Trim() )
+                                    .Except( [ script.Name ] ) ) );
 
-                SpeechResponder.SavePersonality();
-                scriptsView.Refresh();
-                e.Handled = true;
+                    SpeechResponder.SavePersonality();
+                    scriptsView.Refresh();
+                    break;
             }
-
             EDDI.Instance.SpeechResponderModalWait = false;
         }
-        
         private void resetScript(object sender, RoutedEventArgs e)
         {
             if (SpeechResponder?.CurrentPersonality?.Scripts is null) { return; }
@@ -359,13 +356,14 @@ private void resetScript(object sender, RoutedEventArgs e)
                 var messageBoxText = string.Format(Properties.SpeechResponder.reset_script_message, script.Name);
                 var caption = Properties.SpeechResponder.reset_script_button;
                 var result = MessageBox.Show(messageBoxText, caption, MessageBoxButton.YesNo, MessageBoxImage.Warning);
-                if ( result == MessageBoxResult.Yes )
+                switch (result)
                 {
-                    script.Value = script.defaultValue;
-                    SpeechResponder.CurrentPersonality.Scripts[ script.Name ] = script;
-                    SpeechResponder.SavePersonality();
-                    scriptsData.Items.Refresh();
-                    e.Handled = true;
+                    case MessageBoxResult.Yes:
+                        script.Value = script.defaultValue;
+                        SpeechResponder.CurrentPersonality.Scripts[script.Name] = script;
+                        SpeechResponder.SavePersonality();
+                        scriptsData.Items.Refresh();
+                        break;
                 }
             }
         }
@@ -396,7 +394,7 @@ private void newScriptClicked(object sender, RoutedEventArgs e)
 
         private void copyPersonalityClicked(object sender, RoutedEventArgs e)
         {
-            if (SpeechResponder.Personalities is null) { return; }
+            if (SpeechResponder?.Personalities is null) { return; }
             EDDI.Instance.SpeechResponderModalWait = true;
             var window = new CopyPersonalityWindow(SpeechResponder.Personalities)
             {
@@ -418,7 +416,7 @@ private void copyPersonalityClicked(object sender, RoutedEventArgs e)
 
         private void deletePersonalityClicked(object sender, RoutedEventArgs e)
         {
-            if (SpeechResponder.Personalities is null) { return; }
+            if (SpeechResponder?.Personalities is null) { return; }
             EDDI.Instance.SpeechResponderModalWait = true;
             var messageBoxText = string.Format(Properties.SpeechResponder.delete_personality_message, SpeechResponder.CurrentPersonality.Name);
             var caption = Properties.SpeechResponder.delete_personality_caption;

SpeechResponder/SpeechResponder.cs

@@ -29,11 +29,7 @@ public class SpeechResponder : IEddiResponder
         // The file to log speech
         private static readonly string LogFile = Constants.DATA_DIR + @"\speechresponder.out";
 
-        // Static lazy initialization ensures only one thread initializes personalities
-        private static readonly Lazy<ObservableCollection<Personality>> PersonalitiesLazy 
-            = new(InitializePersonalities);
-
-        public static ObservableCollection<Personality> Personalities => PersonalitiesLazy.Value;
+        public ObservableCollection<Personality> Personalities { get; private set; }
 
         public Personality CurrentPersonality
         {
@@ -101,24 +97,28 @@ public string ResponderDescription()
         public SpeechResponder()
         {
             Configuration = ConfigService.Instance.speechResponderConfiguration;
+            Personalities = GetPersonalities();
             TrySetPersonality(Configuration.Personality);
         }
 
         #region Personalities
 
-        private static ObservableCollection<Personality> InitializePersonalities()
+        private ObservableCollection<Personality> GetPersonalities()
         {
-            var personalities = new ObservableCollection<Personality> { Personality.Default() };
+            if (Personalities is not null) { return Personalities; }
+
+            // Initialize our collection and add our default personality
+            Personalities = [ Personality.Default() ];
 
+            // Add our custom personalities
             foreach (var customPersonality in Personality.AllFromDirectory())
             {
                 if (customPersonality != null)
                 {
-                    personalities.Add(customPersonality);
+                    Personalities.Add(customPersonality);
                 }
             }
-
-            return personalities;
+            return Personalities;
         }
 
         /// <summary>
@@ -243,20 +243,7 @@ public void Stop()
         public void Reload()
         {
             Configuration = ConfigService.Instance.speechResponderConfiguration;
-
-            // Clear and repopulate the existing personalities collection
-            var personalities = Personalities;
-            personalities.Clear();
-            personalities.Add(Personality.Default());
-
-            foreach (var customPersonality in Personality.AllFromDirectory())
-            {
-                if (customPersonality != null)
-                {
-                    personalities.Add(customPersonality);
-                }
-            }
-
+            Personalities = GetPersonalities();
             TrySetPersonality(Configuration.Personality);
             Logging.Debug($"Reloaded {ResponderName()}");
         }
@@ -390,7 +377,7 @@ await SpeechService.Instance.SayAsync( ship, speech,
 
         public UserControl ConfigurationTabItem()
         {
-            return new ConfigurationWindow();
+            return new ConfigurationWindow(this);
         }
 
         public Task HandleStatusAsync ( Status status )