Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
8cb84710
Commit
8cb84710
authored
Feb 19, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
addons: add missing b_live flag locking (fix #10718)
parent
addc5f26
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
src/misc/addons.c
src/misc/addons.c
+14
-2
No files found.
src/misc/addons.c
View file @
8cb84710
...
...
@@ -165,10 +165,15 @@ addons_manager_t *addons_manager_New( vlc_object_t *p_this )
void
addons_manager_Delete
(
addons_manager_t
*
p_manager
)
{
vlc_mutex_lock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
if
(
p_manager
->
p_priv
->
finder
.
b_live
)
vlc_cancel
(
*
p_manager
->
p_priv
->
finder
.
p_thread
);
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
vlc_mutex_lock
(
&
p_manager
->
p_priv
->
installer
.
lock
);
if
(
p_manager
->
p_priv
->
installer
.
b_live
)
vlc_cancel
(
*
p_manager
->
p_priv
->
installer
.
p_thread
);
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
installer
.
lock
);
vlc_event_manager_fini
(
p_manager
->
p_event_manager
);
...
...
@@ -193,6 +198,12 @@ void addons_manager_Delete( addons_manager_t *p_manager )
void
addons_manager_Gather
(
addons_manager_t
*
p_manager
,
const
char
*
psz_uri
)
{
vlc_mutex_lock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
if
(
p_manager
->
p_priv
->
finder
.
b_live
)
{
/* Ignore if we're already running */
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
return
;
}
if
(
psz_uri
)
{
p_manager
->
p_priv
->
finder
.
psz_uri_hint
=
strdup
(
psz_uri
);
...
...
@@ -293,7 +304,6 @@ static void *FinderThread( void *p_data )
{
addons_manager_t
*
p_manager
=
p_data
;
int
i_cancel
;
p_manager
->
p_priv
->
finder
.
b_live
=
true
;
addons_finder_t
*
p_finder
=
vlc_custom_create
(
p_manager
->
p_priv
->
p_parent
,
sizeof
(
*
p_finder
),
"entries finder"
);
...
...
@@ -321,7 +331,9 @@ static void *FinderThread( void *p_data )
vlc_object_release
(
p_finder
);
}
vlc_mutex_lock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
p_manager
->
p_priv
->
finder
.
b_live
=
false
;
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
finder
.
lock
);
vlc_event_t
event
;
event
.
type
=
vlc_AddonsDiscoveryEnded
;
...
...
@@ -403,8 +415,8 @@ static void *InstallerThread( void *p_data )
if
(
!
p_manager
->
p_priv
->
installer
.
entries
.
i_size
)
{
/* No queued addons */
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
installer
.
lock
);
p_manager
->
p_priv
->
installer
.
b_live
=
false
;
vlc_mutex_unlock
(
&
p_manager
->
p_priv
->
installer
.
lock
);
break
;
}
...
...
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