summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Conchillo Flaqué <aleix@oblong.com>2014-10-01 15:04:09 -0700
committerTim-Philipp Müller <tim@centricular.com>2014-10-24 20:22:13 +0100
commit87cc061f9ad252e58da9555e56158c9f58788639 (patch)
tree1d0b25dcedee4cdece7a62006d2cc4f47350af6b
parent53aa163facd1ea51ab35b85a5b5cb821c4d63b85 (diff)
downloadgstreamer-plugins-base-87cc061f9ad252e58da9555e56158c9f58788639.tar.gz
rtspconnection: call watch notify before freeing any watch resources
This gives control to the notify function allowing it to finish other watch related functionality. https://bugzilla.gnome.org/show_bug.cgi?id=737752
-rw-r--r--gst-libs/gst/rtsp/gstrtspconnection.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index da969f029..bfc74559a 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -3382,6 +3382,9 @@ gst_rtsp_source_finalize (GSource * source)
{
GstRTSPWatch *watch = (GstRTSPWatch *) source;
+ if (watch->notify)
+ watch->notify (watch->user_data);
+
build_reset (&watch->builder);
gst_rtsp_message_unset (&watch->message);
@@ -3401,9 +3404,6 @@ gst_rtsp_source_finalize (GSource * source)
g_source_unref (watch->controlsrc);
g_mutex_clear (&watch->mutex);
-
- if (watch->notify)
- watch->notify (watch->user_data);
}
static GSourceFuncs gst_rtsp_source_funcs = {