From 6543082d2b6eb75da4bddc5b43aa24e759123fae Mon Sep 17 00:00:00 2001 From: Ognyan Tonchev Date: Wed, 9 Jul 2014 15:16:08 +0200 Subject: [PATCH] client: check if watch is set in handle_teardown() The unit tests run without a watch --- gst/rtsp-server/rtsp-client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index e94567cbee..43c671af8e 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -879,7 +879,8 @@ handle_teardown_request (GstRTSPClient * client, GstRTSPContext * ctx) /* make sure we unblock the backlog and don't accept new messages * on the watch */ - gst_rtsp_watch_set_flushing (priv->watch, TRUE); + if (priv->watch != NULL) + gst_rtsp_watch_set_flushing (priv->watch, TRUE); /* unlink the all TCP callbacks */ unlink_session_transports (client, session, sessmedia); @@ -887,7 +888,8 @@ handle_teardown_request (GstRTSPClient * client, GstRTSPContext * ctx) gst_rtsp_session_media_set_state (sessmedia, GST_STATE_NULL); /* allow messages again so that we can send the reply */ - gst_rtsp_watch_set_flushing (priv->watch, FALSE); + if (priv->watch != NULL) + gst_rtsp_watch_set_flushing (priv->watch, FALSE); /* unmanage the media in the session, returns false if all media session * are torn down. */