From fcf072d9dbac42b037cac8429624ae33909b8f35 Mon Sep 17 00:00:00 2001
From: Alex P <dtk077@gmail.com>
Date: Tue, 11 Nov 2025 22:41:46 +0200
Subject: [PATCH] Fix: coredump issue

---
 audio.go | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/audio.go b/audio.go
index bd1bfde1..9383a46e 100644
--- a/audio.go
+++ b/audio.go
@@ -136,21 +136,37 @@ func setAudioTrack(audioTrack *webrtc.TrackLocalStaticSample) {
 	audioMutex.Lock()
 	currentAudioTrack = audioTrack
 	oldRelay := outputRelay
+	oldSource := outputSource
 	outputRelay = nil
+	outputSource = nil
+	audioMutex.Unlock()
 
-	var newRelay *audio.OutputRelay
-	if outputSource != nil {
-		newRelay = audio.NewOutputRelay(outputSource, audioTrack)
+	// Stop relay and disconnect source outside mutex to avoid blocking during CGO calls
+	if oldRelay != nil {
+		oldRelay.Stop()
+	}
+	if oldSource != nil {
+		oldSource.Disconnect()
+	}
+
+	// Create new source and relay for the new track
+	audioMutex.Lock()
+	if currentAudioTrack != nil && audioOutputEnabled.Load() {
+		alsaDevice := "hw:1,0"
+		newSource := audio.NewCgoOutputSource(alsaDevice)
+		newRelay := audio.NewOutputRelay(newSource, currentAudioTrack)
+		outputSource = newSource
 		outputRelay = newRelay
 	}
 	audioMutex.Unlock()
 
-	// Stop/start outside mutex to avoid blocking during CGO calls
-	if oldRelay != nil {
-		oldRelay.Stop()
-	}
-	if newRelay != nil {
-		if err := newRelay.Start(); err != nil {
+	// Start new relay outside mutex
+	audioMutex.Lock()
+	relayToStart := outputRelay
+	audioMutex.Unlock()
+
+	if relayToStart != nil {
+		if err := relayToStart.Start(); err != nil {
 			audioLogger.Error().Err(err).Msg("Failed to start output relay")
 		}
 	}