gst/playback/gstplaybasebin.c: Handle double disposals, and proper change of URIs.

Original commit message from CVS:
* gst/playback/gstplaybasebin.c:
(gst_play_base_bin_dispose), (gst_play_base_bin_set_property):
Handle double disposals, and proper change of URIs.
This commit is contained in:
Ronald S. Bultje 2004-09-13 18:23:49 +00:00
parent 570dba4fcf
commit 8005b541c5
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* gst/playback/gstplaybasebin.c:
(gst_play_base_bin_dispose), (gst_play_base_bin_set_property):
Handle double disposals, and proper change of URIs.
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/gnomevfs/Makefile.am: * ext/gnomevfs/Makefile.am:

View file

@ -186,6 +186,7 @@ gst_play_base_bin_dispose (GObject * object)
play_base_bin = GST_PLAY_BASE_BIN (object); play_base_bin = GST_PLAY_BASE_BIN (object);
g_free (play_base_bin->uri); g_free (play_base_bin->uri);
play_base_bin->uri = NULL;
if (G_OBJECT_CLASS (parent_class)->dispose) { if (G_OBJECT_CLASS (parent_class)->dispose) {
G_OBJECT_CLASS (parent_class)->dispose (object); G_OBJECT_CLASS (parent_class)->dispose (object);
@ -415,7 +416,7 @@ gst_play_base_bin_set_property (GObject * object, guint prop_id,
g_warning ("cannot set NULL uri"); g_warning ("cannot set NULL uri");
return; return;
} }
if (!play_base_bin->uri || !strcmp (play_base_bin->uri, uri)) { if (!play_base_bin->uri || strcmp (play_base_bin->uri, uri) != 0) {
g_free (play_base_bin->uri); g_free (play_base_bin->uri);
play_base_bin->uri = g_strdup (uri); play_base_bin->uri = g_strdup (uri);