Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't explode if the SdkConfig isn't available

Browse Source 
This can happen prior to logging in, for some reason.

Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-10-29 22:53:59 -06:00
parent 99ee58d13a
commit 72517f95bb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/elements/SettingsCheckbox.js
View File

@ -64,7 +64,7 @@ module.exports = React.createClass({
value={this.props.value}
checked={val === this.props.value}
onChange={this.onChange}
/>
/>
);
}

3
src/settings/ConfigSettingsHandler.js
View File

@ -24,7 +24,8 @@ import SdkConfig from "../SdkConfig";
*/
export default class ConfigSettingsHandler extends SettingsHandler {
getValue(settingName, roomId) {
const settingsConfig = SdkConfig.get()["settingDefaults"];
const config = SdkConfig.get() || {};
const settingsConfig = config["settingDefaults"];
if (!settingsConfig || !settingsConfig[settingName]) return null;
return settingsConfig[settingName];
}