From 62deade97d859a9086708538a3dd2c7c1cde2013 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sun, 11 Aug 2002 19:33:47 +0000
Subject: [PATCH] better error handling, still needs improvement

Original commit message from CVS:
better error handling, still needs improvement
---
 gst/gstpipeline.c  | 6 +++++-
 gst/gstscheduler.c | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gst/gstpipeline.c b/gst/gstpipeline.c
index 972c712dfb..9004ffecd8 100644
--- a/gst/gstpipeline.c
+++ b/gst/gstpipeline.c
@@ -106,7 +106,11 @@ gst_pipeline_init (GstPipeline *pipeline)
   /* get an instance of the default scheduler */
   scheduler = gst_scheduler_factory_make (NULL, GST_ELEMENT (pipeline));
   /* FIXME need better error handling */
-  g_return_if_fail (scheduler != NULL);
+  if (scheduler == NULL)
+  {
+    g_error ("Critical error: could not get a scheduler - \
+	      are you sure you have a registry ?");
+  }
 	  
   gst_scheduler_setup (scheduler);
 }
diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index 8b5526e4b1..3794e24894 100644
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -810,11 +810,17 @@ GstScheduler*
 gst_scheduler_factory_make (const gchar *name, GstElement *parent)
 {
   GstSchedulerFactory *factory;
+  const gchar *default_name = gst_scheduler_factory_get_default_name ();
 
   if (name)
     factory = gst_scheduler_factory_find (name);
   else
-    factory = gst_scheduler_factory_find (gst_scheduler_factory_get_default_name ());
+  {
+    /* FIXME: do better error handling */
+    if (default_name == NULL)
+      g_error ("No default scheduler name - do you have a registry ?");
+    factory = gst_scheduler_factory_find (default_name);
+  }
 
   if (factory == NULL)
     return NULL;