From 17f5785638edd7af241dc028ccb91331498b2cfb Mon Sep 17 00:00:00 2001 From: Ognyan Tonchev Date: Mon, 22 Sep 2014 13:32:06 +0200 Subject: [PATCH] rtsp-client: do not free main context before rtsp watch https://bugzilla.gnome.org/show_bug.cgi?id=737110 --- gst/rtsp-server/rtsp-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 40295fe..df02258 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -750,6 +750,8 @@ gst_rtsp_client_close (GstRTSPClient * client) g_source_destroy ((GSource *) priv->watch); priv->watch = NULL; gst_rtsp_client_set_send_func (client, NULL, NULL, NULL); + g_main_context_unref (priv->watch_context); + priv->watch_context = NULL; } } @@ -3301,8 +3303,6 @@ client_watch_notify (GstRTSPClient * client) GST_INFO ("client %p: watch destroyed", client); priv->watch = NULL; - g_main_context_unref (priv->watch_context); - priv->watch_context = NULL; /* remove all sessions and so drop the extra client ref */ gst_rtsp_client_session_filter (client, cleanup_session, NULL); g_signal_emit (client, gst_rtsp_client_signals[SIGNAL_CLOSED], 0, NULL); -- 2.7.4