Don't load options twice
This commit is contained in:
@@ -86,9 +86,6 @@ class Loader(object):
|
|||||||
splitted = module.split('.')
|
splitted = module.split('.')
|
||||||
for sub in splitted[1:]:
|
for sub in splitted[1:]:
|
||||||
m = getattr(m, sub)
|
m = getattr(m, sub)
|
||||||
|
|
||||||
if hasattr(m, 'config'):
|
|
||||||
fireEvent('settings.options', splitted[-1] + '_config', getattr(m, 'config'))
|
|
||||||
except:
|
except:
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class Plugin(object):
|
|||||||
http_failed_disabled = {}
|
http_failed_disabled = {}
|
||||||
|
|
||||||
def __new__(typ, *args, **kwargs):
|
def __new__(typ, *args, **kwargs):
|
||||||
new_plugin = super(Plugin, typ).__new__(typ, *args, **kwargs)
|
new_plugin = super(Plugin, typ).__new__(typ)
|
||||||
new_plugin.registerPlugin()
|
new_plugin.registerPlugin()
|
||||||
|
|
||||||
return new_plugin
|
return new_plugin
|
||||||
|
|||||||
Reference in New Issue
Block a user