gst/schedulers/entryscheduler.c: refuse to yield when decoupled elements insist on...

Original commit message from CVS:
* gst/schedulers/entryscheduler.c:
(gst_entry_scheduler_yield):
refuse to yield when decoupled elements insist on doing that.
At least it's better than crashing

diff --git a/ChangeLog b/ChangeLog
index d4e4383..df9c24a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-20  Benjamin Otte  <otte@gnome.org>
+
+       * gst/schedulers/entryscheduler.c: 
+       (gst_entry_scheduler_yield):
+         refuse to yield when decoupled elements insist on doing that.
+         At least it's better than crashing
+
 2004-04-19  David Schleef  <ds@schleef.org>
 
        * docs/libs/Makefile.am: Change sinclude to include

diff --git a/gst/schedulers/entryscheduler.c b/gst/schedulers/entryscheduler.c
index 099ef0b..d9dff85 100644 (file)
--- a/gst/schedulers/entryscheduler.c
+++ b/gst/schedulers/entryscheduler.c
@@ -887,7 +887,10 @@ gst_entry_scheduler_state_transition (GstScheduler * scheduler,
 static gboolean
 gst_entry_scheduler_yield (GstScheduler * sched, GstElement * element)
 {
-  g_assert (ELEMENT_PRIVATE (element));
+  /* g_assert (ELEMENT_PRIVATE (element)); */
+  /* FIXME: queue thinks it may just interrupt, is that ok? */
+  if (!ELEMENT_PRIVATE (element))
+    return TRUE;
   ELEMENT_PRIVATE (element)->wait = WAIT_FOR_NOTHING;
   schedule_next_element (GST_ENTRY_SCHEDULER (sched));
   return FALSE;