ext/gconf/gconf.c: Handle a NULL gconf key gracefully by rendering the default element.

Original commit message from CVS:
* ext/gconf/gconf.c: (gst_gconf_render_bin_with_default):
Handle a NULL gconf key gracefully by rendering the default element.

diff --git a/ChangeLog b/ChangeLog
index cf9042bcf055ed72cab5837fb46b4bd983b446e9..344f5277fae042d02f9d1b8a626698cbd8b05a5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-27  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * ext/gconf/gconf.c: (gst_gconf_render_bin_with_default):
+       Handle a NULL gconf key gracefully by rendering the default element.
+
 2007-07-27  Wim Taymans  <wim.taymans@gmail.com>
 
        * gst/rtsp/gstrtspext.h:

diff --git a/ext/gconf/gconf.c b/ext/gconf/gconf.c
index 81c1f5507fa3e361d19158448c88bc01fec02456..2bda066925ca3a6d81b317dc775679626cf0b057 100644 (file)
--- a/ext/gconf/gconf.c
+++ b/ext/gconf/gconf.c
@@ -173,12 +173,13 @@ GstElement *
 gst_gconf_render_bin_with_default (const gchar * bin,
     const gchar * default_sink)
 {
-  GstElement *ret;
+  GstElement *ret = NULL;
   GError *err = NULL;
 
-  ret = gst_parse_bin_from_description (bin, TRUE, &err);
+  if (bin != NULL)
+    ret = gst_parse_bin_from_description (bin, TRUE, &err);
 
-  if (err) {
+  if (ret == NULL || err != NULL) {
     ret = gst_element_factory_make (default_sink, NULL);
 
     if (!ret)