diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 2534657f..71e7fb8a 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -63,7 +63,8 @@ def main(): # Filter out disabled extensions and remove any config errors for them. for extension in installed_extensions: - if ext.validate_extension(extension, config): + enabled = config[extension.ext_name]['enabled'] + if ext.validate_extension(extension) and enabled: enabled_extensions.append(extension) elif extension.ext_name in config_errors: del config_errors[extension.ext_name] @@ -177,7 +178,8 @@ def show_config_callback(option, opt, value, parser): config, errors = config_lib.load(files, extensions, overrides) for extension in extensions: - if ext.validate_extension(extension, config): + enabled = config[extension.ext_name]['enabled'] + if ext.validate_extension(extension) and enabled: enabled_extensions.append(extension) elif extension.ext_name in errors: del errors[extension.ext_name] diff --git a/mopidy/ext.py b/mopidy/ext.py index 4b3252da..325a7800 100644 --- a/mopidy/ext.py +++ b/mopidy/ext.py @@ -112,11 +112,10 @@ def load_extensions(): return installed_extensions -def validate_extension(extension, config): +def validate_extension(extension): """Verify extension's dependencies and environment. :param extensions: and extension to check - :param config: config to check enabled status in :returns: if extensions should be run """ @@ -144,7 +143,7 @@ def validate_extension(extension, config): 'Disabled extension %s: %s', extension.ext_name, ex.message) return False - return config[extension.ext_name]['enabled'] + return True def register_gstreamer_elements(enabled_extensions):