Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
afccd092
Commit
afccd092
authored
Mar 19, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
objects.c: Automatically detach from the parent.
parent
a4e90800
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
16 deletions
+3
-16
src/misc/objects.c
src/misc/objects.c
+3
-16
No files found.
src/misc/objects.c
View file @
afccd092
...
...
@@ -389,6 +389,9 @@ static void vlc_object_destroy( vlc_object_t *p_this )
{
vlc_object_internals_t
*
p_priv
=
vlc_internals
(
p_this
);
/* Automatically detach the object from its parents */
if
(
p_this
->
p_parent
)
vlc_object_detach
(
p_this
);
/* Sanity checks */
if
(
p_this
->
i_children
)
{
...
...
@@ -412,19 +415,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
abort
();
}
if
(
p_this
->
p_parent
)
{
fprintf
(
stderr
,
"ERROR: cannot delete object (id:%i, type:%s, name:%s) "
"with a parent (id:%i, type:%s, name:%s)
\n
"
,
p_this
->
i_object_id
,
p_this
->
psz_object_type
,
p_this
->
psz_object_name
,
p_this
->
p_parent
->
i_object_id
,
p_this
->
p_parent
->
psz_object_type
,
p_this
->
p_parent
->
psz_object_name
);
fflush
(
stderr
);
abort
();
}
/* Call the custom "subclass" destructor */
if
(
p_priv
->
pf_destructor
)
p_priv
->
pf_destructor
(
p_this
);
...
...
@@ -1008,9 +998,6 @@ void __vlc_object_detach( vlc_object_t *p_this )
vlc_mutex_lock
(
&
structure_lock
);
/* Avoid obvious freed object uses */
assert
(
p_this
->
p_internals
->
i_refcount
>
0
);
if
(
!
p_this
->
p_parent
)
{
msg_Err
(
p_this
,
"object is not attached"
);
...
...
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