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
70ad10b0
Commit
70ad10b0
authored
May 16, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplification
parent
00e3e410
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
src/misc/objects.c
src/misc/objects.c
+3
-9
No files found.
src/misc/objects.c
View file @
70ad10b0
...
@@ -877,8 +877,7 @@ void __vlc_object_release( vlc_object_t *p_this )
...
@@ -877,8 +877,7 @@ void __vlc_object_release( vlc_object_t *p_this )
p_libvlc_global
->
i_objects
,
i_index
);
p_libvlc_global
->
i_objects
,
i_index
);
/* Detach from parent to protect against FIND_CHILDREN */
/* Detach from parent to protect against FIND_CHILDREN */
if
(
p_this
->
p_parent
)
vlc_object_detach_unlocked
(
p_this
);
vlc_object_detach_unlocked
(
p_this
);
/* Detach from children to protect against FIND_PARENT */
/* Detach from children to protect against FIND_PARENT */
for
(
int
i
=
0
;
i
<
internals
->
i_children
;
i
++
)
for
(
int
i
=
0
;
i
<
internals
->
i_children
;
i
++
)
internals
->
pp_children
[
i
]
->
p_parent
=
NULL
;
internals
->
pp_children
[
i
]
->
p_parent
=
NULL
;
...
@@ -966,15 +965,10 @@ void __vlc_object_detach( vlc_object_t *p_this )
...
@@ -966,15 +965,10 @@ void __vlc_object_detach( vlc_object_t *p_this )
if
(
!
p_this
)
return
;
if
(
!
p_this
)
return
;
vlc_mutex_lock
(
&
structure_lock
);
vlc_mutex_lock
(
&
structure_lock
);
if
(
!
p_this
->
p_parent
)
if
(
!
p_this
->
p_parent
)
{
msg_Err
(
p_this
,
"object is not attached"
);
msg_Err
(
p_this
,
"object is not attached"
);
vlc_mutex_unlock
(
&
structure_lock
);
else
return
;
vlc_object_detach_unlocked
(
p_this
);
}
vlc_object_detach_unlocked
(
p_this
);
vlc_mutex_unlock
(
&
structure_lock
);
vlc_mutex_unlock
(
&
structure_lock
);
}
}
...
...
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