X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fopen.m;h=c5ef82ead06f812097d1a0ffa66459975d22ac86;hb=9288133f5fe69b685dbda98a08dff8b0d59c6793;hp=e1cf3edf6ce264f57db6e7c57deb4f7483da7e6a;hpb=a6b1608d077c5729f0e91ea16af6418fa3271579;p=vlc diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index e1cf3edf6c..c5ef82ead0 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -832,13 +832,13 @@ static VLCOpen *_o_sharedMainInstance = nil; GetVolParmsInfoBuffer volumeParms; err = FSGetVolumeParms( actualVolume, &volumeParms, sizeof(volumeParms) ); - if ( noErr != err ) { - msg_Err( p_intf, "error retrieving volume params, bailing out" ); - return @""; + if ( noErr == err ) + { + NSString *bsdName = [NSString stringWithUTF8String:(char *)volumeParms.vMDeviceID]; + return [NSString stringWithFormat:@"/dev/r%@", bsdName]; } - NSString *bsdName = [NSString stringWithUTF8String:(char *)volumeParms.vMDeviceID]; - return [NSString stringWithFormat:@"/dev/r%@", bsdName]; + return @""; } - (char *)getVolumeTypeFromMountPath:(NSString *)mountPath @@ -900,7 +900,7 @@ static VLCOpen *_o_sharedMainInstance = nil; BOOL isDir; if ([fm fileExistsAtPath:fullPath isDirectory:&isDir] && isDir) - { + { if ([currentFile caseInsensitiveCompare:@"SVCD"] == NSOrderedSame) { returnValue = kVLCMediaSVCD;