[clutter-gst] player: ensure suburi is set to NULL without subtitle file

[Damien Lespiau <dlespiau src gnome org>]

commit b8f71b1a2ad5722e43e83d74943d7e0c0c6dac0d
Author: Lionel Landwerlin <lionel g landwerlin linux intel com>
Date:   Tue Sep 6 02:05:36 2011 +0100

    player: ensure suburi is set to NULL without subtitle file
    
    And do that that after having set the new URI, not before.

 clutter-gst/clutter-gst-player.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/clutter-gst/clutter-gst-player.c b/clutter-gst/clutter-gst-player.c
index 6f501f9..3e12a55 100644
--- a/clutter-gst/clutter-gst-player.c
+++ b/clutter-gst/clutter-gst-player.c
@@ -451,8 +451,6 @@ set_uri (ClutterGstPlayer *player,
     {
       priv->uri = NULL;
 
-      set_subtitle_uri (player, NULL);
-
       if (priv->tick_timeout_id)
 	{
 	  g_source_remove (priv->tick_timeout_id);
@@ -489,6 +487,7 @@ set_uri (ClutterGstPlayer *player,
       gst_element_set_state (priv->pipeline, GST_STATE_NULL);
 
       g_object_set (priv->pipeline, "uri", uri, NULL);
+      set_subtitle_uri (player, NULL);
       autoload_subtitle (player, uri);
 
       gst_element_set_state (priv->pipeline, state);
@@ -498,6 +497,7 @@ set_uri (ClutterGstPlayer *player,
   else
     {
       priv->is_idle = TRUE;
+      set_subtitle_uri (player, NULL);
       gst_element_set_state (priv->pipeline, GST_STATE_NULL);
       g_object_notify (G_OBJECT (player), "idle");
     }