Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
a46fb0e4
Commit
a46fb0e4
authored
Aug 02, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not leak the IPC helper - might fix #1598
parent
de587c23
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
src/libvlc.h
src/libvlc.h
+4
-0
src/misc/win32_specific.c
src/misc/win32_specific.c
+11
-1
No files found.
src/libvlc.h
View file @
a46fb0e4
...
...
@@ -259,6 +259,10 @@ typedef struct libvlc_priv_t
unsigned
threads_count
;
vlc_mutex_t
threads_lock
;
vlc_cond_t
threads_wait
;
#ifdef WIN32
vlc_object_t
*
ipc_helper
;
#endif
}
libvlc_priv_t
;
static
inline
libvlc_priv_t
*
libvlc_priv
(
libvlc_int_t
*
libvlc
)
...
...
src/misc/win32_specific.c
View file @
a46fb0e4
...
...
@@ -149,6 +149,8 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv
}
}
libvlc_priv
(
p_this
)
->
ipc_helper
=
NULL
;
if
(
config_GetInt
(
p_this
,
"one-instance"
)
||
(
config_GetInt
(
p_this
,
"one-instance-when-started-from-file"
)
&&
config_GetInt
(
p_this
,
"started-from-file"
)
)
)
...
...
@@ -181,8 +183,10 @@ void system_Configure( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv
{
msg_Err
(
p_this
,
"one instance mode DISABLED "
"(IPC helper thread couldn't be created)"
);
vlc_object_release
(
p_helper
);
}
else
libvlc_priv
(
p_this
)
->
ipc_helper
=
p_helper
;
/* Initialization done.
* Release the mutex to unblock other instances */
...
...
@@ -360,6 +364,12 @@ void system_End( libvlc_int_t *p_this )
free
(
vlc_global
()
->
psz_vlcpath
);
vlc_global
()
->
psz_vlcpath
=
NULL
;
}
vlc_object_t
*
obj
=
libvlc_priv
(
p_this
)
->
ipc_helper
;
if
(
obj
)
{
vlc_thread_join
(
obj
);
vlc_object_release
(
obj
);
}
#if !defined( UNDER_CE )
timeEndPeriod
(
5
);
...
...
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