fixed threading issue in libvlc_media_player_get_media

and some cosmetics

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/lib/media_player.c b/lib/media_player.c
index 8eee79c7c1406916e81d3e87d48f7b8240a9e9f3..67bbde7b973dfcafc15b6eacd102a84c1d989dbf 100644 (file)
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -691,12 +691,13 @@ libvlc_media_player_get_media( libvlc_media_player_t *p_mi )
 {
     libvlc_media_t *p_m;
 
-    lock(p_mi);
+    lock( p_mi );
     p_m = p_mi->p_md;
     if( p_m )
-        libvlc_media_retain( p_mi->p_md );
-    unlock(p_mi);
-    return p_mi->p_md;
+        libvlc_media_retain( p_m );
+    unlock( p_mi );
+
+    return p_m;
 }
 
 /**************************************************************************