changeset 8872:07404dc25af8

[gaim-migrate @ 9640] This apparently fixes an IRC crasher under some conditions committer: Tailor Script <tailor@pidgin.im>
author Ethan Blanton <elb@pidgin.im>
date Tue, 04 May 2004 16:29:00 +0000
parents b8c0a53b3022
children 82f0d88ada18
files COPYRIGHT ChangeLog src/protocols/irc/msgs.c
diffstat 3 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Tue May 04 16:15:49 2004 +0000
+++ b/COPYRIGHT	Tue May 04 16:29:00 2004 +0000
@@ -106,6 +106,7 @@
 Kristian Rietveld
 Pekka Riikonen
 Tim Ringenbach
+Luciano Miguel Ferreira Rocha
 Andrew Rodland
 Neil Sanchala
 Carsten Schaar
--- a/ChangeLog	Tue May 04 16:15:49 2004 +0000
+++ b/ChangeLog	Tue May 04 16:29:00 2004 +0000
@@ -23,6 +23,7 @@
 	* Updated and standardized blist signals (Gary Kramlich)
 	* More doxygen fixes (Jonathan Champ)
 	* Copy/paste encoding fixes (Joe Marcus Clarke)
+	* IRC disconnect crash fix (Luciano Miguel Ferreira Rocha)
 
 version 0.77 (04/22/2004):
 	New Features:
--- a/src/protocols/irc/msgs.c	Tue May 04 16:15:49 2004 +0000
+++ b/src/protocols/irc/msgs.c	Tue May 04 16:29:00 2004 +0000
@@ -390,7 +390,8 @@
 	gaim_connection_set_state(gc, GAIM_CONNECTED);
 
 	irc_blist_timeout(irc);
-	irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
+	if (!irc->timer)
+		irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc);
 }
 
 void irc_msg_nochan(struct irc_conn *irc, const char *name, const char *from, char **args)