# HG changeset patch
# User Charly COSTE <changaco@changaco.net>
# Date 1251309986 -7200
# Node ID 2507f424773ababdafaee79da4ec9906d9d298d5
# Parent  a2258a705a17f96ccfe63aff8c5fc07a06f1effa
Fixed a bug introduced in previous commit

Signed-off-by: Charly COSTE <changaco@changaco.net>

diff --git a/bot.py b/bot.py
--- a/bot.py
+++ b/bot.py
@@ -287,9 +287,13 @@ class bot(Thread):
 				self.error('=> Debug: length of arguments should be greater than 0 for a kick event')
 				return
 			
-			if event.eventtype() in ['pubmsg', 'action'] and nickname == self.nickname:
-				self.error('=> Debug: ignoring IRC '+event.eventtype()+' sent by self', debug=True)
-				return
+			if event.eventtype() in ['pubmsg', 'action']:
+				if connection.get_nickname() == self.nickname:
+					self.error('=> Debug: ignoring IRC '+event.eventtype()+' not received on bot connection', debug=True)
+					return
+				if nickname == self.nickname:
+					self.error('=> Debug: ignoring IRC '+event.eventtype()+' sent by self', debug=True)
+					return
 			
 			# TODO: lock self.bridges for thread safety
 			for bridge in self.bridges: