From 2d80b2e463fb4e999550574bbeb0a6b566a2b205 Mon Sep 17 00:00:00 2001
From: sh <37271604+shumvgolove@users.noreply.github.com>
Date: Wed, 17 Jun 2026 12:28:49 +0400
Subject: [PATCH] fix(webrtc): stop preview tracks when abandoning pre-connect
 call (#7074)

---
 packages/simplex-chat-webrtc/src/call.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/simplex-chat-webrtc/src/call.ts b/packages/simplex-chat-webrtc/src/call.ts
index 5f3d2bf332..8441560013 100644
--- a/packages/simplex-chat-webrtc/src/call.ts
+++ b/packages/simplex-chat-webrtc/src/call.ts
@@ -583,6 +583,8 @@ const processCommand = (function () {
         case "capabilities":
           console.log("starting outgoing call - capabilities")
           if (activeCall) endCall()
+          // Stop a preview stream from an earlier pre-connect outgoing call being replaced (activeCall may be null here)
+          stopNotConnectedCall()
 
           let localStream: MediaStream | null = null
           try {
@@ -623,7 +625,8 @@ const processCommand = (function () {
           if (activeCall) endCall()
 
           // It can be already defined on Android when switching calls (if the previous call was outgoing)
-          notConnectedCall = undefined
+          // Stop its preview tracks before clearing, otherwise camera/mic stay live
+          stopNotConnectedCall()
           inactiveCallMediaSources.mic = true
           inactiveCallMediaSources.camera = command.media == CallMediaType.Video
           inactiveCallMediaSourcesChanged(inactiveCallMediaSources)
@@ -1444,6 +1447,14 @@ const processCommand = (function () {
     }
   }
 
+  // Call on any path that abandons notConnectedCall, otherwise its preview camera/mic tracks stay live.
+  function stopNotConnectedCall() {
+    if (notConnectedCall) {
+      notConnectedCall.localStream.getTracks().forEach((track) => track.stop())
+      notConnectedCall = undefined
+    }
+  }
+
   function resetVideoElements() {
     const videos = getVideoElements()
     if (!videos) return