Merge branch 1.0-bugfix

b65308f0 · Rémi Denis-Courmont · 44f031cb · 9a185500 · b65308f0
Commit b65308f0 authored May 13, 2009 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

src/control/media_player.c src/control/media_player.c +3 -2

No files found.
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -413,10 +413,11 @@ void libvlc_media_player_release( libvlc_media_player_t *p_mi )
 **************************************************************************/
 void libvlc_media_player_retain( libvlc_media_player_t *p_mi )
 {
-    if( !p_mi )
+    assert( p_mi );
-        return;
+    vlc_mutex_lock( &p_mi->object_lock );
    p_mi->i_refcount++;
+    vlc_mutex_unlock( &p_mi->object_lock );
 }
 /**************************************************************************