tools/gst-launch.c: When we got an error, there is no point in waiting for preroll...

Original commit message from CVS:
* tools/gst-launch.c: (main):
When we got an error, there is no point in waiting for preroll when
shutting down.

diff --git a/ChangeLog b/ChangeLog
index a03eccc..bf48d51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-07-03  Wim Taymans  <wim.taymans@gmail.com>
 
+       * tools/gst-launch.c: (main):
+       When we got an error, there is no point in waiting for preroll when
+       shutting down.
+
+2007-07-03  Wim Taymans  <wim.taymans@gmail.com>
+
        * plugins/elements/gsttee.c: (gst_tee_base_init),
        (gst_tee_request_new_pad), (gst_tee_release_pad),
        (gst_tee_find_buffer_alloc), (gst_tee_buffer_alloc),

diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index 616e5b8..6b7b0d1 100644 (file)
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -745,7 +745,8 @@ main (int argc, char *argv[])
 
     fprintf (stderr, _("Setting pipeline to PAUSED ...\n"));
     gst_element_set_state (pipeline, GST_STATE_PAUSED);
-    gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE);
+    if (!caught_error)
+      gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE);
     fprintf (stderr, _("Setting pipeline to READY ...\n"));
     gst_element_set_state (pipeline, GST_STATE_READY);
     gst_element_get_state (pipeline, &state, &pending, GST_CLOCK_TIME_NONE);