Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
6f3acaad
Commit
6f3acaad
authored
Nov 14, 2007
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix double vlc_object_attach().
parent
1bc8330a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
src/osd/osd.c
src/osd/osd.c
+2
-4
No files found.
src/osd/osd.c
View file @
6f3acaad
...
...
@@ -66,7 +66,8 @@ static osd_menu_t *osd_ParserLoad( vlc_object_t *p_this, const char *psz_file )
msg_Err
(
p_this
,
"out of memory"
);
return
NULL
;
}
vlc_object_attach
(
p_this
,
p_menu
);
vlc_object_yield
(
p_menu
);
vlc_object_attach
(
p_menu
,
p_this
->
p_libvlc
);
/* Stuff needed for Parser */
p_menu
->
psz_file
=
strdup
(
psz_file
);
...
...
@@ -156,9 +157,6 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file )
osd_UpdateState
(
p_osd
->
p_state
,
p_osd
->
i_x
,
p_osd
->
i_y
,
p_osd
->
i_width
,
p_osd
->
i_height
,
NULL
);
vlc_object_yield
(
p_osd
);
vlc_object_attach
(
p_osd
,
p_this
->
p_libvlc
);
/* Signal when an update of OSD menu is needed */
var_Create
(
p_osd
,
"osd-menu-update"
,
VLC_VAR_BOOL
);
var_Create
(
p_osd
,
"osd-menu-visible"
,
VLC_VAR_BOOL
);
...
...
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