# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1165428260 0
# Node ID 2bec32a6f3033ed7ef469e2483b552ffd5281ce1
# Parent  6cb9996fcc97cb4fe20e7cf6af3d811b9bb64b92
[gaim-migrate @ 17902]
I tested my changes from yesterday and they caused uns crashy boom.
We were trying to free some proxy_connect_data but it had already
been set to NULL (because one of the two parallel connections
failed immediately, and the second one succeeded).

committer: Tailor Script <tailor@pidgin.im>

diff -r 6cb9996fcc97 -r 2bec32a6f303 libgaim/protocols/oscar/peer.c
--- a/libgaim/protocols/oscar/peer.c	Wed Dec 06 07:24:41 2006 +0000
+++ b/libgaim/protocols/oscar/peer.c	Wed Dec 06 18:04:20 2006 +0000
@@ -528,10 +528,14 @@
 	gaim_timeout_remove(conn->connect_timeout_timer);
 	conn->connect_timeout_timer = 0;
 
-	if (verified) {
+	if (conn->client_connect_data != NULL)
+	{
 		gaim_proxy_connect_cancel(conn->client_connect_data);
 		conn->client_connect_data = NULL;
-	} else {
+	}
+
+	if (conn->verified_connect_data != NULL)
+	{
 		gaim_proxy_connect_cancel(conn->verified_connect_data);
 		conn->verified_connect_data = NULL;
 	}