# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1306201706 0
# Node ID 3e53f6871805cba558ceec2320f7249f15dbbbde
# Parent  504a65e03514e18a7f15fe1e989d46fad2756e61# Parent  4ad7ff6bdc4e28020b7fabd2e6fbd53a2721d0d2
merge of 'b8354dfc19eecdfd2aecfdb2685fbd78b9010587'
     and 'e406ff22b49f15b4ba4888f05f0e019b38575ea2'

diff -r 504a65e03514 -r 3e53f6871805 libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Fri May 20 22:29:29 2011 +0000
+++ b/libpurple/media/backend-fs2.c	Tue May 24 01:48:26 2011 +0000
@@ -1091,13 +1091,7 @@
 	g_error_free(error);
 	g_free(debug_msg);
 
-	/* Not entirely sure this is correct, but prevents a
-	 * NULL deref crash.
-	 */
-	if (!element)
-		return;
-
-	while (!GST_IS_PIPELINE(element)) {
+	while (element && !GST_IS_PIPELINE(element)) {
 		if (element == priv->confbin)
 			break;
 
@@ -1105,7 +1099,7 @@
 		element = GST_ELEMENT_PARENT(element);
 	}
 
-	if (!GST_IS_PIPELINE(element))
+	if (!element || !GST_IS_PIPELINE(element))
 		return;
 
 	sessions = purple_media_get_session_ids(priv->media);