From aea624b6f8b93d506eb7b1f8a8b9086ca552856f Mon Sep 17 00:00:00 2001
From: Steven Hoving <sh@bigbrother.nl>
Date: Tue, 2 Feb 2016 09:01:51 +0100
Subject: [PATCH] rtsp-media: fix state_lock not locked again when preroll
 fails

https://bugzilla.gnome.org/show_bug.cgi?id=761399
---
 gst/rtsp-server/rtsp-media.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 90a9ddb2cf..9e49c5d357 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -3465,6 +3465,7 @@ static gboolean
 default_unsuspend (GstRTSPMedia * media)
 {
   GstRTSPMediaPrivate *priv = media->priv;
+  gboolean preroll_ok;
 
   switch (priv->suspend_mode) {
     case GST_RTSP_SUSPEND_MODE_NONE:
@@ -3478,12 +3479,13 @@ default_unsuspend (GstRTSPMedia * media)
       gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARING);
       if (!start_preroll (media))
         goto start_failed;
+
       g_rec_mutex_unlock (&priv->state_lock);
-
-      if (!wait_preroll (media))
-        goto preroll_failed;
-
+      preroll_ok = wait_preroll (media);
       g_rec_mutex_lock (&priv->state_lock);
+
+      if (!preroll_ok)
+        goto preroll_failed;
     }
     default:
       break;