PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #5891 from SimonBrandner/fix/context-switching

Browse source 
Avoid being stuck in a space
This commit is contained in:
Michael Telatynski 2021-04-20 15:28:47 +01:00 committed by GitHub
commit eba0fbf902
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/stores/SpaceStore.tsx
View file

@ -514,7 +514,13 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
const room = this.matrixClient?.getRoom(payload.room_id); const room = this.matrixClient?.getRoom(payload.room_id);
// persist last viewed room from a space // persist last viewed room from a space
if (room) {
// Don't save if the room is a space room. This would cause a problem:
// When switching to a space home, we first view that room and
// only after that we switch to that space. This causes us to
// save the space home to be the last viewed room in the home
// space.
if (room && !room.isSpaceRoom()) {
window.localStorage.setItem(getLastViewedRoomsStorageKey(this.activeSpace), payload.room_id); window.localStorage.setItem(getLastViewedRoomsStorageKey(this.activeSpace), payload.room_id);
} }