diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/gconf/gconf.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -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 81c1f550..2bda0669 100644 --- 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) |