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

More explicit reference checking

pull/21833/head
Simon Merrick 2020-12-02 12:34:43 +13:00
parent e92ac67152
commit cf8c98e076
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/utils/permalinks/Permalinks.js
View File

@ -130,13 +130,14 @@ export class RoomPermalinkCreator {
}
forRoom() {
try {
if (this._room) {
// Prefer to use canonical alias for permalink if possible
const alias = this._room.getCanonicalAlias();
return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
} catch (error) {
return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
if (alias) {
return getPermalinkConstructor().forRoom(alias, this._serverCandidates);
}
}
return getPermalinkConstructor().forRoom(this._roomId, this._serverCandidates);
}
onRoomState(event) {