diff --git a/plugin.py b/plugin.py index 66199ba..9b27d6d 100644 --- a/plugin.py +++ b/plugin.py @@ -4499,7 +4499,8 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler): or m in self.registryValue('modesToAskWhenOpped', channel=channel, network=irc.network): toCommit = True item = chan.removeItem(m, value, msg.prefix, c) - toremove.append(item) + if item and item.channel == channel: + toremove.append(item) if n: n.addLog(channel, 'sets %s %s' % (mode, value)) if item: @@ -4598,7 +4599,7 @@ class ChanTracker(callbacks.Plugin, plugins.ChannelDBHandler): db.commit() if len(toremove): for r in toremove: - i.verifyRemoval(irc, channel, r.mode, r.value, db, self, r.uid) + i.verifyRemoval(irc, r.channel, r.mode, r.value, db, self, r.uid) if irc.state.channels[channel].isHalfopPlus(irc.nick) \ and not self.registryValue('keepOp', channel=channel, network=irc.network): self.forceTickle = True