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
d48d2349
Commit
d48d2349
authored
Jul 09, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remoteosd: partially fix worker thread cleanup
parent
0fc60fee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
modules/video_filter/remoteosd.c
modules/video_filter/remoteosd.c
+5
-10
No files found.
modules/video_filter/remoteosd.c
View file @
d48d2349
...
...
@@ -312,6 +312,11 @@ static void DestroyFilter( vlc_object_t *p_this )
vlc_cancel
(
p_sys
->
worker_thread
);
vlc_join
(
p_sys
->
worker_thread
,
NULL
);
if
(
p_sys
->
p_pic
!=
NULL
)
picture_Release
(
p_sys
->
p_pic
);
if
(
p_sys
->
i_socket
>=
0
)
net_Close
(
p_sys
->
i_socket
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
free
(
p_sys
->
psz_host
);
free
(
p_sys
->
psz_passwd
);
...
...
@@ -668,16 +673,6 @@ static void* vnc_worker_thread( void *obj )
exit:
vlc_mutex_lock
(
&
p_sys
->
lock
);
p_sys
->
i_socket
=
-
1
;
if
(
p_sys
->
p_pic
)
picture_Release
(
p_sys
->
p_pic
);
p_sys
->
b_need_update
=
true
;
vlc_mutex_unlock
(
&
p_sys
->
lock
);
net_Close
(
fd
);
msg_Dbg
(
p_filter
,
"VNC message reader thread ended"
);
vlc_restorecancel
(
canc
);
return
NULL
;
...
...
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