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
6ceee192
Commit
6ceee192
authored
Apr 15, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix race condition which caused hiding the main split view (close #11103)
parent
0b4c9bc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+1
-0
modules/gui/macosx/intf.m
modules/gui/macosx/intf.m
+0
-2
No files found.
modules/gui/macosx/VLCVoutWindowController.m
View file @
6ceee192
...
...
@@ -196,6 +196,7 @@
[
o_new_video_window
setHasActiveVideo
:
YES
];
[
o_vout_dict
setObject
:[
o_new_video_window
autorelease
]
forKey
:[
NSValue
valueWithPointer
:
p_wnd
]];
[[
VLCMain
sharedInstance
]
setActiveVideoPlayback
:
YES
];
[[
VLCMainWindow
sharedInstance
]
setNonembedded
:
!
b_mainwindow_has_video
];
// beware of order, setActiveVideoPlayback:, setHasActiveVideo: and setNonembedded: must be called before
...
...
modules/gui/macosx/intf.m
View file @
6ceee192
...
...
@@ -135,8 +135,6 @@ int WindowOpen(vout_window_t *p_wnd, const vout_window_cfg_t *cfg)
return
VLC_EGENERIC
;
}
[[
VLCMain
sharedInstance
]
setActiveVideoPlayback
:
YES
];
SEL
sel
=
@selector
(
setupVoutForWindow
:
withProposedVideoViewPosition
:
);
NSInvocation
*
inv
=
[
NSInvocation
invocationWithMethodSignature
:[
o_vout_controller
methodSignatureForSelector
:
sel
]];
[
inv
setTarget
:
o_vout_controller
];
...
...
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