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
52be1354
Commit
52be1354
authored
Aug 30, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Win32: fix vlc_control_cancel from main() task
parent
475d7593
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
src/misc/threads.c
src/misc/threads.c
+6
-3
No files found.
src/misc/threads.c
View file @
52be1354
...
@@ -850,16 +850,19 @@ void vlc_control_cancel (int cmd, ...)
...
@@ -850,16 +850,19 @@ void vlc_control_cancel (int cmd, ...)
va_start
(
ap
,
cmd
);
va_start
(
ap
,
cmd
);
vlc_cancel_t
*
nfo
=
vlc_threadvar_get
(
&
cancel_key
);
vlc_cancel_t
*
nfo
=
vlc_threadvar_get
(
&
cancel_key
);
#ifndef WIN32
if
(
nfo
==
NULL
)
if
(
nfo
==
NULL
)
{
{
#ifdef WIN32
/* Main thread - cannot be cancelled anyway */
return
;
#else
nfo
=
malloc
(
sizeof
(
*
nfo
));
nfo
=
malloc
(
sizeof
(
*
nfo
));
if
(
nfo
==
NULL
)
if
(
nfo
==
NULL
)
abort
();
return
;
/* Uho! Expect problems! */
*
nfo
=
VLC_CANCEL_INIT
;
*
nfo
=
VLC_CANCEL_INIT
;
vlc_threadvar_set
(
&
cancel_key
,
nfo
);
vlc_threadvar_set
(
&
cancel_key
,
nfo
);
}
#endif
#endif
}
switch
(
cmd
)
switch
(
cmd
)
{
{
...
...
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