mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtspconnection: No remove child if destroyed.

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=740730
This commit is contained in:
Göran Jönsson 2014-11-25 13:31:48 +01:00 committed by Wim Taymans
parent 3c17b86639
commit e3a212e0d4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/rtsp/gstrtspconnection.c
View file

@ -3142,7 +3142,8 @@ gst_rtsp_source_dispatch_read (GPollableInputStream * stream,
else if (G_UNLIKELY (res == GST_RTSP_EEOF)) { else if (G_UNLIKELY (res == GST_RTSP_EEOF)) {
g_mutex_lock (&watch->mutex); g_mutex_lock (&watch->mutex);
if (watch->readsrc) { if (watch->readsrc) {
g_source_remove_child_source ((GSource *) watch, watch->readsrc); if (!g_source_is_destroyed ((GSource *) watch))
g_source_remove_child_source ((GSource *) watch, watch->readsrc);
g_source_unref (watch->readsrc); g_source_unref (watch->readsrc);
watch->readsrc = NULL; watch->readsrc = NULL;
} }
@ -3305,7 +3306,8 @@ gst_rtsp_source_dispatch_write (GPollableOutputStream * stream,
rec = g_queue_pop_tail (watch->messages); rec = g_queue_pop_tail (watch->messages);
if (rec == NULL) { if (rec == NULL) {
if (watch->writesrc) { if (watch->writesrc) {
g_source_remove_child_source ((GSource *) watch, watch->writesrc); if (!g_source_is_destroyed ((GSource *) watch))
g_source_remove_child_source ((GSource *) watch, watch->writesrc);
g_source_unref (watch->writesrc); g_source_unref (watch->writesrc);
watch->writesrc = NULL; watch->writesrc = NULL;
/* we create and add the write source again when we actually have /* we create and add the write source again when we actually have