Also fallis back to C string if UTF8 string fails in proprieties window.

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index b5e0e9248775dbb5d47be28d89be030cc8c46d1b..ce9ca2738cbf0d0dc2715dac2d9c85b3abba5a03 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>486 129 505 517 0 0 1024 746 </string>
+       <string>409 195 505 517 0 0 1024 746 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 66ba9a6fa2f17fd15ba1c613ef973c1b175e558e..8adfdab473ba4f33c6ab06d0a251836a74a1e166 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index 1ea18cd840a41003f2e4205dae7b7805682d4bfb..377f1a5b9301836eb15836cbab8c443222e06a60 100644 (file)
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -69,14 +69,16 @@
             [o_uri_txt setStringValue:
                 ([NSString stringWithUTF8String:p_playlist->
                     pp_items[i_item]->psz_uri] == nil ) ?
-                @"" :
+                [NSString stringWithCString:p_playlist->
+                    pp_items[i_item]->psz_uri] :
                 [NSString stringWithUTF8String:p_playlist->
                     pp_items[i_item]->psz_uri]];
 
             [o_title_txt setStringValue:
                 ([NSString stringWithUTF8String:p_playlist->
                     pp_items[i_item]->psz_name] == nil ) ?
-                @"" :
+                [NSString stringWithCString:p_playlist->
+                    pp_items[i_item]->psz_name] :
                 [NSString stringWithUTF8String:p_playlist->
                     pp_items[i_item]->psz_name]];