---
 plugins/rtp/rtpstream.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/rtp/rtpstream.c b/plugins/rtp/rtpstream.c
index aba41b8..ad0617b 100644
--- a/plugins/rtp/rtpstream.c
+++ b/plugins/rtp/rtpstream.c
@@ -978,9 +978,9 @@ farsight_rtp_stream_bus_watch_cb (GstBus *bus, GstMessage 
*message,
       STREAM_DEBUG (stream, "end of stream on stream pipeline from %s",
           source_name);
       g_free (source_name);
+      farsight_rtp_stream_stop (stream);
       farsight_stream_signal_error (stream,
           FARSIGHT_STREAM_ERROR_EOS, NULL);
-      farsight_rtp_stream_stop (stream);
       break;
       }
     case GST_MESSAGE_ERROR:
@@ -990,6 +990,7 @@ farsight_rtp_stream_bus_watch_cb (GstBus *bus, GstMessage 
*message,
 
       gst_message_parse_error (message, &err, &debug);
 
+      farsight_rtp_stream_stop (stream);
       if (err == NULL) {
         STREAM_WARNING (stream, "gst_message_parse_error returned err == 
NULL");
 
@@ -1013,7 +1014,6 @@ farsight_rtp_stream_bus_watch_cb (GstBus *bus, GstMessage 
*message,
         g_error_free (err);
 
       }
-      farsight_rtp_stream_stop (stream);
       break;
       }
     case GST_MESSAGE_CLOCK_LOST:
@@ -1036,20 +1036,20 @@ farsight_rtp_stream_bus_watch_cb (GstBus *bus, 
GstMessage *message,
         STREAM_DEBUG (stream, "Changing state of the pipeline to PAUSED");
         ret = gst_element_set_state (self->priv->pipeline, GST_STATE_PAUSED);
         if (ret == GST_STATE_CHANGE_FAILURE) {
+          farsight_rtp_stream_stop (stream);
           farsight_stream_signal_error (stream,
               FARSIGHT_STREAM_ERROR_UNKNOWN, "Problem setting pipeline to 
paused"
               "due to lost clock");
-          farsight_rtp_stream_stop (stream);
         }
 
         STREAM_DEBUG (self, "Changing state of the pipeline to PLAYING - %d",
             ret);
         ret = gst_element_set_state (self->priv->pipeline, GST_STATE_PLAYING);
         if (ret == GST_STATE_CHANGE_FAILURE) {
+          farsight_rtp_stream_stop (stream);
           farsight_stream_signal_error (stream,
               FARSIGHT_STREAM_ERROR_UNKNOWN, "Problem setting pipeline to 
playing"
               "due to lost clock");
-          farsight_rtp_stream_stop (stream);
         }
       }
       break;
@@ -4422,9 +4422,9 @@ farsight_rtp_stream_connection_timed_out (gpointer data)
       FARSIGHT_STREAM_STATE_CONNECTING)
   {
     STREAM_WARNING (self, "Could not establish a connection");
+    farsight_rtp_stream_stop (FARSIGHT_STREAM(self));
     farsight_stream_signal_error (FARSIGHT_STREAM(self),
         FARSIGHT_STREAM_ERROR_TIMEOUT, "Could not establish a connection");
-    farsight_rtp_stream_stop (FARSIGHT_STREAM(self));
   }
 
   return FALSE;
-- 
1.5.6.5


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Farsight-devel mailing list
Farsight-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/farsight-devel

Reply via email to