notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed error that sometimes happen when fdie is used

Browse Source
This commit is contained in:
Jimmy Cao 2011-08-11 13:29:54 -05:00
parent b686a1caf4
commit a08bb9e60e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oyoyo/client.py
View File

@ -229,7 +229,6 @@ class IRCClient(object):
if self.socket: if self.socket:
logging.info('closing socket') logging.info('closing socket')
self.socket.close() self.socket.close()
raise SystemExit # lets exit
def msg(self, user, msg): def msg(self, user, msg):
for line in msg.split('\n'): for line in msg.split('\n'):
self.send("PRIVMSG", user, ":{0}".format(line)) self.send("PRIVMSG", user, ":{0}".format(line))

11
wolfgame.py
View File

@ -180,12 +180,7 @@ def forced_exit(cli, nick, *rest): # Admin Only
else: else:
reset(cli) reset(cli)
reset(cli)
dict.clear(COMMANDS)
dict.clear(PM_COMMANDS)
dict.clear(HOOKS)
cli.quit("Forced quit from "+nick) cli.quit("Forced quit from "+nick)
raise SystemExit
@ -198,9 +193,7 @@ def restart_program(cli, nick, *rest):
stop_game(cli) stop_game(cli)
else: else:
reset(cli) reset(cli)
dict.clear(COMMANDS)
dict.clear(PM_COMMANDS)
dict.clear(HOOKS)
cli.quit("Forced restart from "+nick) cli.quit("Forced restart from "+nick)
raise SystemExit raise SystemExit
finally: finally:
@ -2042,6 +2035,8 @@ def start(cli, nick, chan, rest):
def on_error(cli, pfx, msg): def on_error(cli, pfx, msg):
if msg.endswith("(Excess Flood)"): if msg.endswith("(Excess Flood)"):
restart_program(cli, "excess flood") restart_program(cli, "excess flood")
elif msg.endswith("(Client Quit)"):
raise SystemExit