Loop over disabled events, for single returns
This commit is contained in:
@@ -44,10 +44,17 @@ def fireEvent(name, *args, **kwargs):
|
|||||||
|
|
||||||
if single and not merge:
|
if single and not merge:
|
||||||
results = None
|
results = None
|
||||||
if result[0][0] is True and result[0][1] is not None:
|
|
||||||
results = result[0][1]
|
# Loop over results, stop when first not None result is found.
|
||||||
elif result[0][1]:
|
for r in result:
|
||||||
errorHandler(result[0][1])
|
if r[0] is True and r[1] is not None:
|
||||||
|
results = r[1]
|
||||||
|
break
|
||||||
|
elif r[1]:
|
||||||
|
errorHandler(r[1])
|
||||||
|
else:
|
||||||
|
log.debug('Assume disabled plugin: %s' % r[2])
|
||||||
|
|
||||||
else:
|
else:
|
||||||
results = []
|
results = []
|
||||||
for r in result:
|
for r in result:
|
||||||
|
|||||||
Reference in New Issue
Block a user