OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2584 from matrix-org/bwindels/fixrelogincustomtags 

Fix: logging in again breaks CustomRoomTagStore
pull/21833/head
Bruno Windels 2019-02-07 15:07:49 +00:00 committed by GitHub
parent 594bd86a0c d2ac434545
commit 80731a9de4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/stores/CustomRoomTagStore.js
View File

@ -48,7 +48,7 @@ class CustomRoomTagStore extends EventEmitter {
constructor() { constructor() {
super(); super();
// Initialise state // Initialise state
this._state = {tags: this._getUpdatedTags()}; this._state = {tags: {}};
this._roomListStoreToken = RoomListStore.addListener(() => { this._roomListStoreToken = RoomListStore.addListener(() => {
this._setState({tags: this._getUpdatedTags()}); this._setState({tags: this._getUpdatedTags()});
@ -113,7 +113,8 @@ class CustomRoomTagStore extends EventEmitter {
} }
break; break;
case 'on_logged_out': { case 'on_logged_out': {
this._state = {}; // we assume to always have a tags object in the state
this._state = {tags: {}};
if (this._roomListStoreToken) { if (this._roomListStoreToken) {
this._roomListStoreToken.remove(); this._roomListStoreToken.remove();
this._roomListStoreToken = null; this._roomListStoreToken = null;