From bf131f76dcdaf313639d6b5f2b353528f2c8533b Mon Sep 17 00:00:00 2001
From: Gigiaj <gigiaboone@yahoo.com>
Date: Sun, 25 May 2025 22:09:17 -0500
Subject: [PATCH] Re-add intended switching behavior

---
 src/app/features/room-nav/RoomNavItem.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index b450c007..d77353b7 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -236,6 +236,7 @@ export function RoomNavItem({
     (receipt) => receipt.userId !== mx.getUserId()
   );
   const { navigateRoom } = useRoomNavigate();
+  const { roomIdOrAlias: viewedRoomId } = useParams();
   const screenSize = useScreenSizeContext();
   const isMobile = screenSize === ScreenSize.Mobile;
 
@@ -264,7 +265,9 @@ export function RoomNavItem({
     if (room.isCallRoom()) {
       if (!isMobile) {
         if (activeCallRoomId !== room.roomId) {
-          navigateRoom(room.roomId);
+          if (mx.getRoom(viewedRoomId)?.isCallRoom()) {
+            navigateRoom(room.roomId);
+          }
           hangUp(room.roomId);
           setActiveCallRoomId(room.roomId);
         } else {