From 2d28c5226b5b6afa77b9a515625cd362e49a0327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 4 Aug 2006 15:15:24 +0000 Subject: [PATCH] gst/gstelement.c: Don't crash printing the warning if the pad has no parent. Original commit message from CVS: * gst/gstelement.c: (gst_element_remove_pad): Don't crash printing the warning if the pad has no parent. --- ChangeLog | 5 +++++ gst/gstelement.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cf1b93ed5d..a8fbade853 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-08-04 Tim-Philipp Müller + + * gst/gstelement.c: (gst_element_remove_pad): + Don't crash printing the warning if the pad has no parent. + 2006-08-02 Wim Taymans * libs/gst/dataprotocol/dataprotocol.c: diff --git a/gst/gstelement.c b/gst/gstelement.c index 5fe258e7d0..42a3b7c20a 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -746,8 +746,7 @@ not_our_pad: /* FIXME, locking order? */ GST_OBJECT_LOCK (element); g_critical ("Padname %s:%s does not belong to element %s when removing", - GST_ELEMENT_NAME (GST_PAD_PARENT (pad)), GST_PAD_NAME (pad), - GST_ELEMENT_NAME (element)); + GST_DEBUG_PAD_NAME (pad), GST_ELEMENT_NAME (element)); GST_OBJECT_UNLOCK (element); GST_OBJECT_UNLOCK (pad); return FALSE;