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

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Weblate 2017-11-15 11:15:57 +00:00
commit 0847596083
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/settings/handlers/AccountSettingsHandler.js
View file

@ -64,7 +64,9 @@ export default class AccountSettingHandler extends SettingsHandler {
}
_getSettings(eventType = "im.vector.web.settings") {
const event = MatrixClientPeg.get().getAccountData(eventType);
const cli = MatrixClientPeg.get();
if (!cli) return {};
const event = cli.getAccountData(eventType);
if (!event || !event.getContent()) return {};
return event.getContent();
}