From 2d25d0f9169daa76b380b207c4915e3c8cadc5e1 Mon Sep 17 00:00:00 2001
From: jim3692 <jim3692@gmail.com>
Date: Wed, 22 Mar 2023 19:26:28 +0200
Subject: [PATCH] Rollback listeners

---
 src/app/organisms/room/JitsiRoom.jsx | 5 ++++-
 src/app/organisms/room/Room.jsx      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/organisms/room/JitsiRoom.jsx b/src/app/organisms/room/JitsiRoom.jsx
index 7b0cee60..e40ee59e 100644
--- a/src/app/organisms/room/JitsiRoom.jsx
+++ b/src/app/organisms/room/JitsiRoom.jsx
@@ -45,7 +45,10 @@ function JitsiRoom(props) {
       }
     };
 
-    navigation.once(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    return () => {
+      navigation.removeListener(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    };
   }, [mx, roomInfo]);
 
   useEffect(() => {
diff --git a/src/app/organisms/room/Room.jsx b/src/app/organisms/room/Room.jsx
index 77c1bb3b..15021d81 100644
--- a/src/app/organisms/room/Room.jsx
+++ b/src/app/organisms/room/Room.jsx
@@ -41,7 +41,10 @@ function Room(props) {
       }
     };
 
-    navigation.once(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    return () => {
+      navigation.removeListener(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    };
   }, [roomInfo]);
 
   useEffect(() => {