short circuit automatic switch to related space behaviour and fix tests

2021-05-07 11:08:18 +01:00
parent 9d9dce7a91
commit f0e61e6286
2 changed files with 10 additions and 3 deletions
--- a/src/stores/SpaceStore.tsx
+++ b/src/stores/SpaceStore.tsx
@@ -535,7 +535,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                    // Don't context switch when navigating to the space room
                    // as it will cause you to end up in the wrong room
                    this.setActiveSpace(room, false);
-                } else if (!this.getSpaceFilteredRoomIds(this.activeSpace).has(roomId)) {
+                } else if (this.activeSpace && !this.getSpaceFilteredRoomIds(this.activeSpace).has(roomId)) {
                    this.switchToRelatedSpace(roomId);
                }