Merge branch 't3chguy/fix/15182' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15182

pull/21833/head
Michael Telatynski 2020-09-18 19:34:59 +01:00
commit ffcdaa55e5
1 changed files with 1 additions and 1 deletions

View File

@ -263,7 +263,7 @@ export default class SettingsStore {
* @param {string} settingName The setting to look up. * @param {string} settingName The setting to look up.
* @return {boolean} True if the setting is enabled. * @return {boolean} True if the setting is enabled.
*/ */
public static isEnabled(settingName: string) { public static isEnabled(settingName: string): boolean {
if (!SETTINGS[settingName]) return false; if (!SETTINGS[settingName]) return false;
return SETTINGS[settingName].controller ? !SETTINGS[settingName].controller.settingDisabled : true; return SETTINGS[settingName].controller ? !SETTINGS[settingName].controller.settingDisabled : true;
} }