check on roomId instead of room

matrix-org · Nov 22, 2021 · 160989b · 160989b
1 parent 57e11d3
commit 160989b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/components/views/voip/CallPreview.tsx b/src/components/views/voip/CallPreview.tsx
@@ -118,7 +118,7 @@ export default class CallPreview extends React.Component<IProps, IState> {
         this.roomStoreToken = RoomViewStore.addListener(this.onRoomViewStoreUpdate);
         this.dispatcherRef = dis.register(this.onAction);
         MatrixClientPeg.get().on(CallEvent.RemoteHoldUnhold, this.onCallRemoteHold);
-        const room = MatrixClientPeg.get().getRoom(this.state.roomId);
+        const room = MatrixClientPeg.get()?.getRoom(this.state.roomId);
         if (room) {
             WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(room), this.updateCalls);
         }
@@ -142,12 +142,14 @@ export default class CallPreview extends React.Component<IProps, IState> {
         if (newRoomId === oldRoomId) return;
         // The WidgetLayoutStore observer always tracks the currently viewed Room,
         // so we don't end up with multiple observers and know what observer to remove on unmount
-        const newRoom = MatrixClientPeg.get().getRoom(newRoomId);
-        const oldRoom = MatrixClientPeg.get().getRoom(oldRoomId);
+        const oldRoom = MatrixClientPeg.get()?.getRoom(oldRoomId);
         if (oldRoom) {
             WidgetLayoutStore.instance.off(WidgetLayoutStore.emissionForRoom(oldRoom), this.updateCalls);
         }
-        WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(newRoom), this.updateCalls);
+        const newRoom = MatrixClientPeg.get()?.getRoom(newRoomId);
+        if (newRoom) {
+            WidgetLayoutStore.instance.on(WidgetLayoutStore.emissionForRoom(newRoom), this.updateCalls);
+        }
 
         const [primaryCall, secondaryCalls] = getPrimarySecondaryCallsForPip(newRoomId);
         this.setState({