Merge branch 'TomRiddle01-hide_adblock_message'

This commit is contained in:
Florian Bruhin 2017-03-05 15:19:09 +01:00
commit 0e56cff702
2 changed files with 3 additions and 1 deletions

View File

@ -219,6 +219,7 @@ Contributors, sorted by the number of commits in descending order:
* rsteube
* neeasade
* jnphilipp
* Yannis Rohloff
* Tobias Patzl
* Stefan Tatschner
* Samuel Loury

View File

@ -165,7 +165,8 @@ class HostBlocker:
if not found:
args = objreg.get('args')
if (config.get('content', 'host-block-lists') is not None and
args.basedir is None):
args.basedir is None and
config.get('content', 'host-blocking-enabled')):
message.info("Run :adblock-update to get adblock lists.")
@cmdutils.register(instance='host-blocker')