[farsight2/master] Release the lock also for early return

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


---
 gst/fsrtpconference/fs-rtp-substream.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gst/fsrtpconference/fs-rtp-substream.c b/gst/fsrtpconference/fs-rtp-substream.c
index bda4929..5907d2d 100644
--- a/gst/fsrtpconference/fs-rtp-substream.c
+++ b/gst/fsrtpconference/fs-rtp-substream.c
@@ -438,9 +438,14 @@ fs_rtp_sub_stream_stop_no_rtcp_timeout_thread (FsRtpSubStream *self)
     gst_clock_id_unschedule (self->priv->no_rtcp_timeout_id);
 
   if (self->priv->no_rtcp_timeout_thread == NULL)
+  {
+    FS_RTP_SUB_STREAM_UNLOCK(self);
     return;
-
-  FS_RTP_SUB_STREAM_UNLOCK(self);
+  }
+  else
+  {
+    FS_RTP_SUB_STREAM_UNLOCK(self);
+  }
 
   g_thread_join (self->priv->no_rtcp_timeout_thread);
 
-- 
1.5.6.5




More information about the farsight-commits mailing list