[farsight2/master] Stop the streamtransmitter first, to make sure no callbacks are called afterwise

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:20:15 PST 2008


---
 gst/fsrtpconference/fs-rtp-stream.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-stream.c b/gst/fsrtpconference/fs-rtp-stream.c
index 271319d..da9a3c8 100644
--- a/gst/fsrtpconference/fs-rtp-stream.c
+++ b/gst/fsrtpconference/fs-rtp-stream.c
@@ -210,6 +210,11 @@ fs_rtp_stream_dispose (GObject *object)
     return;
   }
 
+  if (self->priv->stream_transmitter) {
+    g_object_unref (self->priv->stream_transmitter);
+    self->priv->stream_transmitter = NULL;
+  }
+
   FS_RTP_SESSION_LOCK (self->priv->session);
   if (self->priv->substreams) {
     g_list_foreach (self->priv->substreams, (GFunc) gst_object_unref, NULL);
@@ -223,11 +228,6 @@ fs_rtp_stream_dispose (GObject *object)
     self->priv->participant = NULL;
   }
 
-  if (self->priv->stream_transmitter) {
-    g_object_unref (self->priv->stream_transmitter);
-    self->priv->stream_transmitter = NULL;
-  }
-
   /* Make sure dispose does not run twice. */
   self->priv->disposed = TRUE;
 
-- 
1.5.6.5




More information about the farsight-commits mailing list