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
98a2c4f8
Commit
98a2c4f8
authored
May 01, 2011
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fixed corner-case crash
parent
75e52d8c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
modules/gui/macosx/embeddedwindow.m
modules/gui/macosx/embeddedwindow.m
+7
-5
No files found.
modules/gui/macosx/embeddedwindow.m
View file @
98a2c4f8
/*****************************************************************************
/*****************************************************************************
* embeddedwindow.m: MacOS X interface module
* embeddedwindow.m: MacOS X interface module
*****************************************************************************
*****************************************************************************
* Copyright (C) 2005-20
08
the VideoLAN team
* Copyright (C) 2005-20
11
the VideoLAN team
* $Id$
* $Id$
*
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
* Authors: Benjamin Pracht <bigben at videolan dot org>
...
@@ -425,22 +425,24 @@
...
@@ -425,22 +425,24 @@
vout_thread_t
*
p_vout
=
getVout
();
vout_thread_t
*
p_vout
=
getVout
();
BOOL
blackout_other_displays
=
config_GetInt
(
VLCIntf
,
"macosx-black"
);
BOOL
blackout_other_displays
=
config_GetInt
(
VLCIntf
,
"macosx-black"
);
screen
=
[
NSScreen
screenWithDisplayID
:(
CGDirectDisplayID
)
var_GetInteger
(
p_vout
,
"video-device"
)];
if
(
p_vout
)
screen
=
[
NSScreen
screenWithDisplayID
:(
CGDirectDisplayID
)
var_GetInteger
(
p_vout
,
"video-device"
)];
[
self
lockFullscreenAnimation
];
[
self
lockFullscreenAnimation
];
if
(
!
screen
)
if
(
!
screen
)
{
{
msg_Dbg
(
p_vout
,
"chosen screen isn't present, using current screen for fullscreen mode"
);
msg_Dbg
(
VLCIntf
,
"chosen screen isn't present, using current screen for fullscreen mode"
);
screen
=
[
self
screen
];
screen
=
[
self
screen
];
}
}
if
(
!
screen
)
if
(
!
screen
)
{
{
msg_Dbg
(
p_vout
,
"Using deepest screen"
);
msg_Dbg
(
VLCIntf
,
"Using deepest screen"
);
screen
=
[
NSScreen
deepestScreen
];
screen
=
[
NSScreen
deepestScreen
];
}
}
vlc_object_release
(
p_vout
);
if
(
p_vout
)
vlc_object_release
(
p_vout
);
screen_rect
=
[
screen
frame
];
screen_rect
=
[
screen
frame
];
...
...
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