3 files changed, 12 insertions, 6 deletions
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 5e72ef1c..839366b9 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -72,7 +72,7 @@ static void gst_osselement_class_init (GstOssElementClass * klass);
 
 static void gst_ossprobe_interface_init (GstPropertyProbeInterface * iface);
 static void gst_osselement_init (GstOssElement * oss);
-static void gst_osselement_dispose (GObject * object);
+static void gst_osselement_finalize (GObject * object);
 
 static void gst_osselement_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec);
@@ -164,7 +164,7 @@ gst_osselement_class_init (GstOssElementClass * klass)
 
   gobject_class->set_property = gst_osselement_set_property;
   gobject_class->get_property = gst_osselement_get_property;
-  gobject_class->dispose = gst_osselement_dispose;
+  gobject_class->finalize = gst_osselement_finalize;
 
   gstelement_class->change_state = gst_osselement_change_state;
 }
@@ -434,14 +434,14 @@ gst_osselement_init (GstOssElement * oss)
 }
 
 static void
-gst_osselement_dispose (GObject * object)
+gst_osselement_finalize (GObject * object)
 {
   GstOssElement *oss = (GstOssElement *) object;
 
   g_free (oss->device);
   g_free (oss->mixer_dev);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 void
diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index d2935760..e9c7438c 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -152,7 +152,10 @@ gst_osssink_dispose (GObject * object)
 {
   GstOssSink *osssink = (GstOssSink *) object;
 
-  gst_object_unparent (GST_OBJECT (osssink->provided_clock));
+  if (osssink->provided_clock) {
+    gst_object_unparent (GST_OBJECT (osssink->provided_clock));
+    osssink->provided_clock = NULL;
+  }
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c
index ffc750d7..60edc390 100644
--- a/sys/oss/gstosssrc.c
+++ b/sys/oss/gstosssrc.c
@@ -222,7 +222,10 @@ gst_osssrc_dispose (GObject * object)
 {
   GstOssSrc *osssrc = (GstOssSrc *) object;
 
-  gst_object_unparent (GST_OBJECT (osssrc->provided_clock));
+  if (osssrc->provided_clock != NULL) {
+    gst_object_unparent (GST_OBJECT (osssrc->provided_clock));
+    osssrc->provided_clock = NULL;
+  }
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }