imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into t3chguy/fix/17022

Browse source
This commit is contained in:
Michael Telatynski 2021-04-27 11:16:02 +01:00 • committed by GitHub
commit f18a24025a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
55 changed files with 1962 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stores/SpaceStore.tsx
View file

@ -560,7 +560,9 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
if (!room || payload.context_switch) break;
if (room.isSpaceRoom()) {
this.setActiveSpace(room);
// 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(room.roomId)) {
let parent = this.getCanonicalParent(room.roomId);
if (!parent) {