macosx: more approbiate locking suggested by fenrir

and fixed a small typo

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 7d3fc06e582af4d0563f69dea1e408b3ce230198..01bdef0faf0010aed21a5f91319a39431ee208d8 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -324,7 +324,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         NSAlert *ourAlert;
         int i_returnValue;
         NSString *o_blabla;
-        if( MACOS_VERSION == 10.5f )
+        if( MACOS_VERSION == 10.4f )
             o_blabla = _NS("VLC's last release for your OS is the 0.9 series." );
         else if( MACOS_VERSION == 10.3f )
             o_blabla = _NS("VLC's last release for your OS is VLC 0.8.6i, which is prone to known security issues." );

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 334edfed86ba9a676ef47c36af1833e51a81e448..393fabea0c161c0b44f096effa5e5937414d8132 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -575,9 +575,9 @@
 
     PL_LOCK;
     p_item = playlist_CurrentPlayingItem( p_playlist );
-    PL_UNLOCK;
     if( p_item == NULL )
     {
+        PL_UNLOCK;
         pl_Release( VLCIntf );
         return;
     }
@@ -601,6 +601,7 @@
 
     }
 
+    PL_UNLOCK;
     pl_Release( VLCIntf );
 }