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
248d9c52
Commit
248d9c52
authored
Oct 14, 2007
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
playlist.c: removed potential deadlock and duplicate signalling
parent
7f3af96e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/playlist/engine.c
src/playlist/engine.c
+3
-3
src/playlist/thread.c
src/playlist/thread.c
+0
-1
No files found.
src/playlist/engine.c
View file @
248d9c52
...
@@ -334,14 +334,14 @@ check_input:
...
@@ -334,14 +334,14 @@ check_input:
if
(
p_item
==
NULL
)
if
(
p_item
==
NULL
)
{
{
msg_Dbg
(
p_playlist
,
"nothing to play"
);
msg_Dbg
(
p_playlist
,
"nothing to play"
);
p_playlist
->
status
.
i_status
=
PLAYLIST_STOPPED
;
PL_UNLOCK
if
(
b_playexit
==
VLC_TRUE
)
if
(
b_playexit
==
VLC_TRUE
)
{
{
msg_Info
(
p_playlist
,
"end of playlist, exiting"
);
msg_Info
(
p_playlist
,
"end of playlist, exiting"
);
vlc_object_kill
(
p_playlist
->
p_libvlc
);
vlc_object_kill
(
p_playlist
->
p_libvlc
);
}
}
p_playlist
->
status
.
i_status
=
PLAYLIST_STOPPED
;
PL_UNLOCK
ObjectGarbageCollector
(
p_playlist
,
VLC_TRUE
);
ObjectGarbageCollector
(
p_playlist
,
VLC_TRUE
);
return
;
return
;
}
}
...
...
src/playlist/thread.c
View file @
248d9c52
...
@@ -138,7 +138,6 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
...
@@ -138,7 +138,6 @@ int playlist_ThreadDestroy( playlist_t * p_playlist )
{
{
// Tell playlist to go to last loop
// Tell playlist to go to last loop
vlc_object_kill
(
p_playlist
);
vlc_object_kill
(
p_playlist
);
playlist_Signal
(
p_playlist
);
// Kill preparser
// Kill preparser
if
(
p_playlist
->
p_preparse
)
if
(
p_playlist
->
p_preparse
)
...
...
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