Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
68889de9
Commit
68889de9
authored
Jul 15, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed crash when opening DVDs with uncommon disk names (close #7146)
parent
cc1f8bf6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/gui/macosx/open.m
modules/gui/macosx/open.m
+6
-6
No files found.
modules/gui/macosx/open.m
View file @
68889de9
...
@@ -832,13 +832,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -832,13 +832,13 @@ static VLCOpen *_o_sharedMainInstance = nil;
GetVolParmsInfoBuffer
volumeParms
;
GetVolParmsInfoBuffer
volumeParms
;
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
err
=
FSGetVolumeParms
(
actualVolume
,
&
volumeParms
,
sizeof
(
volumeParms
)
);
if
(
noErr
!=
err
)
{
if
(
noErr
==
err
)
msg_Err
(
p_intf
,
"error retrieving volume params, bailing out"
);
{
return
@""
;
NSString
*
bsdName
=
[
NSString
stringWithUTF8String
:(
char
*
)
volumeParms
.
vMDeviceID
];
return
[
NSString
stringWithFormat
:
@"/dev/r%@"
,
bsdName
];
}
}
NSString
*
bsdName
=
[
NSString
stringWithUTF8String
:(
char
*
)
volumeParms
.
vMDeviceID
];
return
@""
;
return
[
NSString
stringWithFormat
:
@"/dev/r%@"
,
bsdName
];
}
}
-
(
char
*
)
getVolumeTypeFromMountPath
:(
NSString
*
)
mountPath
-
(
char
*
)
getVolumeTypeFromMountPath
:(
NSString
*
)
mountPath
...
@@ -900,7 +900,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
...
@@ -900,7 +900,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
BOOL
isDir
;
BOOL
isDir
;
if
([
fm
fileExistsAtPath
:
fullPath
isDirectory
:
&
isDir
]
&&
isDir
)
if
([
fm
fileExistsAtPath
:
fullPath
isDirectory
:
&
isDir
]
&&
isDir
)
{
{
if
([
currentFile
caseInsensitiveCompare
:
@"SVCD"
]
==
NSOrderedSame
)
if
([
currentFile
caseInsensitiveCompare
:
@"SVCD"
]
==
NSOrderedSame
)
{
{
returnValue
=
kVLCMediaSVCD
;
returnValue
=
kVLCMediaSVCD
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment