# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1089056028 0
# Node ID b6feee45f33d5611dd9a279721565852cfbf8139
# Parent  28280c108cc4f90079233bdd4f2b899e6b1252f8
[gaim-migrate @ 10278]
This should fix a harmless failed g_return_if_fail type debug warning
type thing on opening a switchboard connection to someone.

committer: Tailor Script <tailor@pidgin.im>

diff -r 28280c108cc4 -r b6feee45f33d src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Mon Jul 05 19:24:33 2004 +0000
+++ b/src/protocols/msn/switchboard.c	Mon Jul 05 19:33:48 2004 +0000
@@ -66,7 +66,7 @@
 	/* gaim_debug_info("msn", "user=[%s], total=%d\n", user,
 	 * swboard->current_users); */
 
-	if (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT)
+	if ((swboard->conv != NULL) && (gaim_conversation_get_type(swboard->conv) == GAIM_CONV_CHAT))
 	{
 		gaim_conv_chat_add_user(GAIM_CONV_CHAT(swboard->conv), user, NULL);
 	}