Mercurial > pidgin.yaz

diff libpurple/protocols/msn/slp.c @ 30449:5be6177e369e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
This doesn't appear to be a programming error.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 19 Apr 2010 08:20:24 +0000
parents 911ca152210c
children c73a650f952a
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c	Mon Apr 19 08:05:55 2010 +0000
+++ b/libpurple/protocols/msn/slp.c	Mon Apr 19 08:20:24 2010 +0000
@@ -667,7 +667,8 @@
 		g_return_if_fail(slpcall->xfer != NULL);
 
 		/* Don't do anything if we already have a direct connection */
-		g_return_if_fail(slpcall->slplink->dc == NULL);
+		if (slpcall->slplink->dc != NULL)
+			return;
 
 		bridges = get_token(content, "Bridges: ", "\r\n");
 		if(bridges && strstr(bridges, "TCPv1") != NULL) {