Merge pull request #6730 from matrix-org/t3chguy/fix/17974

Don't context switch room on SpaceStore ready as it can break permalinks
matrix-org · Sep 3, 2021 · 0b07a70 · 0b07a70
2 parents f7e491f + 44b4561
commit 0b07a70
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/stores/SpaceStore.tsx b/src/stores/SpaceStore.tsx
@@ -782,7 +782,8 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
         // restore selected state from last session if any and still valid
         const lastSpaceId = window.localStorage.getItem(ACTIVE_SPACE_LS_KEY);
         if (lastSpaceId) {
-            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId));
+            // don't context switch here as it may break permalinks
+            this.setActiveSpace(this.matrixClient.getRoom(lastSpaceId), false);
         }
     }