# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1226603479 0
# Node ID 9d2ae363907901a098e45ec28178d033b3b98a8d
# Parent  1406a2fa649d9abc294df9a3b11078e11b80e484# Parent  e71c1fad229f234918483fe6b22284ff70f76b19
merge of 'b1b60077658bb1e01f71e81175786a8e7c3c4916'
     and 'd74085222c90ffa62b79ed27984dded8a8725c00'

diff -r 1406a2fa649d -r 9d2ae3639079 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Thu Nov 13 18:55:04 2008 +0000
+++ b/libpurple/protocols/msn/slp.c	Thu Nov 13 19:11:19 2008 +0000
@@ -758,17 +758,20 @@
 
 	if (slplink->swboard == NULL)
 	{
-		/* We will need this in order to change its flags. */
-		slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
-		/* If swboard is NULL, something has probably gone wrong earlier on
-		 * I didn't want to do this, but MSN 7 is somehow causing us to crash
-		 * here, I couldn't reproduce it to debug more, and people are
-		 * reporting bugs. Hopefully this doesn't cause more crashes. Stu.
-		 */
-		if (slplink->swboard != NULL)
+		if (cmdproc->data == NULL)
+			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
+		else {
+			/*
+			 * We will swboard in order to change its flags.  If its
+			 * NULL, something has probably gone wrong earlier on.  I
+			 * didn't want to do this, but MSN 7 is somehow causing us
+			 * to crash here, I couldn't reproduce it to debug more,
+			 * and people are reporting bugs. Hopefully this doesn't
+			 * cause more crashes. Stu.
+			 */
+			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
 			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
-		else
-			purple_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n");
+		}
 	}
 
 	msn_slplink_process_msg(slplink, msg);