diff --git a/plugins/Scheduler/plugin.py b/plugins/Scheduler/plugin.py index 104344153..91d4ca907 100644 --- a/plugins/Scheduler/plugin.py +++ b/plugins/Scheduler/plugin.py @@ -148,6 +148,13 @@ class Scheduler(callbacks.Plugin): channel=msg.channel, network=irc.network) if remove: del self.events[str(f.eventId)] + + # A previous run of the command may have set 'ignored' to True, + # causing this run to not include response from nested commands; + # as NestedCommandsIrcProxy.reply() would confuse it with the + # subcommand setting 'ignored' to True itself. + msg.tag('ignored', False) + self.Proxy(irc, msg, tokens) return f diff --git a/src/callbacks.py b/src/callbacks.py index 85f4d8020..97f6a1eca 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -996,13 +996,6 @@ class NestedCommandsIrcProxy(ReplyIrcProxy): # work, but we're being careful. self.args = copy.deepcopy(args) - # Another trick needed for Scheduler: - # A previous run of the command may have set 'ignored' to True, - # causing this run to not include response from nested commands; - # as NestedCommandsIrcProxy.reply() would confuse it with the - # subcommand setting 'ignored' to True itself. - msg.tag('ignored', False) - self.counter = 0 self._resetReplyAttributes() if not args: