Merge branch 'develop' into gsouquet/cache-decrypt

This commit is contained in:
Germain Souquet 2021-05-10 17:34:44 +01:00
commit 17f4945323
56 changed files with 1140 additions and 649 deletions

View file

@ -150,7 +150,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
}
private async appendRoom(room: Room) {
if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) return; // hide space rooms
if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) return; // hide space rooms
let updated = false;
const rooms = (this.state.rooms || []).slice(); // cheap clone