Merge branch 'master' of https://github.com/krebscode/painload

1 files changed, 2 insertions, 1 deletions

diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 6d19fd09..89967c3f 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -54,7 +54,7 @@ class asybot(asychat):
     # passed without a message.  Any incoming message will reset alarm.
     self.alarm_timeout = getconf('irc_alarm_timeout')
     self.hammer_interval = getconf('irc_hammer_interval')
-    self.kill_timeout = 360
+    self.kill_timeout = getconf('irc_kill_timeout')
     signal(SIGALRM, lambda signum, frame: self.alarm_handler())
     self.reset_alarm()
 
@@ -129,6 +129,7 @@ class asybot(asychat):
       y = match(command['pattern'], rest)
       if y:
         self.execute_command(command, y, PRIVMSG, ME)
+        break
 
   def execute_command(self, command, match, PRIVMSG, ME):
     from os.path import realpath, dirname, join