changeset 27667:9f9e70099573

merge of '080022da62aff247ec296e6c817cae0fc476b6a6' and '3b1faad42b89245e12673c727b8f0c237e96c798'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 22 Jul 2009 03:15:48 +0000
parents feb17f2b5b7a (diff) c43c87965db9 (current diff)
children b29eac4769e9
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/mediamanager.c	Wed Jul 22 02:36:28 2009 +0000
+++ b/libpurple/mediamanager.c	Wed Jul 22 03:15:48 2009 +0000
@@ -780,7 +780,8 @@
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
-		gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
+		if (peer != NULL)
+			gst_element_release_request_pad(GST_ELEMENT_PARENT(peer), peer);
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);