Merge pull request #2541 from robintown/local-on-local

Don't show local media on top of itself
element-hq · Aug 7, 2024 · 9b5072c · 9b5072c
2 parents b13fa85 + bf5128c
commit 9b5072c
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
@@ -488,11 +488,17 @@ export class CallViewModel extends ViewModel {
         ? ([of(screenShares.map((m) => m.vm)), this.spotlightSpeaker] as const)
         : ([
             this.spotlightSpeaker.pipe(map((speaker) => [speaker!])),
-            this.localUserMedia.pipe(
-              switchMap((vm) =>
-                vm.alwaysShow.pipe(
-                  map((alwaysShow) => (alwaysShow ? vm : null)),
-                ),
+            this.spotlightSpeaker.pipe(
+              switchMap((speaker) =>
+                speaker.local
+                  ? of(null)
+                  : this.localUserMedia.pipe(
+                      switchMap((vm) =>
+                        vm.alwaysShow.pipe(
+                          map((alwaysShow) => (alwaysShow ? vm : null)),
+                        ),
+                      ),
+                    ),
               ),
             ),
           ] as const),