[Xfce4-commits] <parole:master> Get if stream has video before init its properties on exit

[Ali Abdallah]

Updating branch refs/heads/master
         to f86f09018bd96b401d28cc097f5c17a936012611 (commit)
       from 0f52bb130c2f73cecd2b4ef449c427371dfe1077 (commit)

commit f86f09018bd96b401d28cc097f5c17a936012611
Author: Ali Abdallah <ali at ali-xfce.org>
Date:   Sun Oct 11 16:44:35 2009 +0000

    Get if stream has video before init its properties on exit

 parole/parole-gst.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/parole/parole-gst.c b/parole/parole-gst.c
index f9defed..fd6bc89 100644
--- a/parole/parole-gst.c
+++ b/parole/parole-gst.c
@@ -1515,19 +1515,17 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean fade_sound)
 {
     gboolean playing_video;
     
-    g_mutex_lock (gst->priv->lock);
+    g_object_get (G_OBJECT (gst->priv->stream), 
+		  "has-video", &playing_video,
+		  NULL);
     
-    parole_stream_init_properties (gst->priv->stream);
+    g_mutex_lock (gst->priv->lock);
     gst->priv->target = GST_STATE_NULL;
-    
+    parole_stream_init_properties (gst->priv->stream);
     g_mutex_unlock (gst->priv->lock);
 
     parole_window_busy_cursor (GTK_WIDGET (gst)->window);
     
-    g_object_get (G_OBJECT (gst->priv->stream), 
-		  "has-video", &playing_video,
-		  NULL);
-    
     if ( fade_sound && gst->priv->state == GST_STATE_PLAYING && !playing_video )
     {
 	gdouble volume;