Commit 1364d7b0 authored by Jan Schmidt's avatar Jan Schmidt
Browse files

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.
parent e98177af
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:
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment