gst/gstbus.c: Don't print a warning if the queue is empty when we try to pop here. That could happen if another threa...

Original commit message from CVS:
Patch by: Sjoerd Simons <sjoerd at luon net>
* gst/gstbus.c: (gst_bus_source_dispatch):
Don't print a warning if the queue is empty when we try to pop
here. That could happen if another thread or callback set the
bus to flushing between the source's check/prepare and the
dispatch being called (#531538).
This commit is contained in:
Sjoerd Simons 2008-05-05 16:47:29 +00:00 committed by Tim-Philipp Müller
parent 76f4e0eec9
commit e0a92a0604
2 changed files with 15 additions and 1 deletions

View file

@ -1,3 +1,13 @@
2008-05-05 Tim-Philipp Müller <tim.muller at collabora co uk>
Patch by: Sjoerd Simons <sjoerd at luon net>
* gst/gstbus.c: (gst_bus_source_dispatch):
Don't print a warning if the queue is empty when we try to pop
here. That could happen if another thread or callback set the
bus to flushing between the source's check/prepare and the
dispatch being called (#531538).
2008-05-05 Tim-Philipp Müller <tim.muller at collabora co uk>
* plugins/elements/gstmultiqueue.c:

View file

@ -769,7 +769,11 @@ gst_bus_source_dispatch (GSource * source, GSourceFunc callback,
g_return_val_if_fail (GST_IS_BUS (bus), FALSE);
message = gst_bus_pop (bus);
g_return_val_if_fail (message != NULL, FALSE);
/* The message queue might be empty if some other thread or callback set
* the bus to flushing between check/prepare and dispatch */
if (G_UNLIKELY (message == NULL))
return TRUE;
if (!handler)
goto no_handler;