Bugfix

src/Zen.Desktop.Host/Infrastructure/Host.cs

@@ -105,20 +105,18 @@ private void SetMotherboard(Model model)
             _motherboard = null;
         }
 
-        _motherboard = new Motherboard(model);
+        _motherboard = new Motherboard(model, AppSettings.Instance.AudioEngine switch
+        {
+            AudioEngine.Bass => new BassAudioEngine(),
+            _ => new PortAudioEngine()
+        });
 
         _motherboard.AddPeripheral(new Peripherals.Keyboard());
         _motherboard.AddPeripheral(new Peripherals.Kempston());
         _motherboard.AddPeripheral(new Peripherals.DiskDrive());
 
         _motherboard.Sound = AppSettings.Instance.Sound;
 
-        _motherboard.AudioEngine = AppSettings.Instance.AudioEngine switch
-        {
-            AudioEngine.Bass => new BassAudioEngine(),
-            _ => new PortAudioEngine()
-        };
-
         _motherboard.Fast = AppSettings.Instance.Speed == Speed.Fast;
         _motherboard.Slow = AppSettings.Instance.Speed == Speed.Slow;
 

src/Zen.System/Modules/AyAudio.cs

@@ -16,7 +16,7 @@ public class AyAudio : IDisposable
 
     private readonly MixerDac _mixerDac = new();
 
-    private IZenAudioEngine _engine = new PortAudioEngine();
+    private IZenAudioEngine _engine;
 
     private readonly CancellationTokenSource _cancellationTokenSource;
 
@@ -56,7 +56,12 @@ public int BufferSize
 
     public IZenAudioEngine AudioEngine
     {
-        set => _engine = value;
+        set
+        {
+            _engine.Dispose();
+
+            _engine = value; 
+        }
     }
 
     public bool Silent { get; set; }
@@ -65,8 +70,10 @@ public IZenAudioEngine AudioEngine
 
     public Action<float>? BeeperSignalHook { get; set; }
 
-    public AyAudio()
+    public AyAudio(IZenAudioEngine engine)
     {
+        _engine = engine;
+
         _buffer = new float[_bufferSize];
 
         _cancellationTokenSource = new CancellationTokenSource();

src/Zen.System/Motherboard.cs

@@ -85,7 +85,7 @@ public IZenAudioEngine AudioEngine
         set => _ayAudio.AudioEngine = value;
     }
 
-    public Motherboard(Model model)
+    public Motherboard(Model model, IZenAudioEngine engine)
     {
         _model = model;
 
@@ -110,7 +110,7 @@ public Motherboard(Model model)
 
         _videoModulator = new VideoModulator(_ram);
 
-        _ayAudio = new AyAudio();
+        _ayAudio = new AyAudio(engine);
 
         _ayAudio.Start();