Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
1d6f5ed5
Commit
1d6f5ed5
authored
Aug 12, 2008
by
Mirsal Ennaime
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Telepathy: Fix a crash.
parent
83e5162f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
10 deletions
+4
-10
modules/misc/notify/notify.c
modules/misc/notify/notify.c
+1
-5
modules/misc/notify/telepathy.c
modules/misc/notify/telepathy.c
+3
-5
No files found.
modules/misc/notify/notify.c
View file @
1d6f5ed5
...
...
@@ -144,14 +144,10 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
char
*
psz_artist
=
NULL
;
char
*
psz_album
=
NULL
;
char
*
psz_arturl
=
NULL
;
input_thread_t
*
p_input
=
NULL
;
playlist_t
*
p_playlist
=
pl_Yield
(
p_this
);
input_thread_t
*
p_input
=
((
playlist_t
*
)
p_this
)
->
p_input
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
intf_sys_t
*
p_sys
=
p_intf
->
p_sys
;
p_input
=
p_playlist
->
p_input
;
pl_Release
(
p_this
);
if
(
!
p_input
)
return
VLC_SUCCESS
;
vlc_object_yield
(
p_input
);
...
...
modules/misc/notify/telepathy.c
View file @
1d6f5ed5
...
...
@@ -169,6 +169,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
{
VLC_UNUSED
(
oldval
);
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
param
;
playlist_t
*
p_playlist
=
(
playlist_t
*
)
p_this
;
char
*
psz_buf
=
NULL
;
input_thread_t
*
p_input
;
...
...
@@ -193,11 +194,7 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
p_intf
->
p_sys
->
i_item_changes
++
;
}
playlist_t
*
p_playlist
=
pl_Yield
(
p_this
);
p_input
=
p_playlist
->
p_input
;
pl_Release
(
p_this
);
if
(
!
p_input
)
return
VLC_SUCCESS
;
vlc_object_yield
(
p_input
);
...
...
@@ -219,7 +216,8 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
var_AddCallback
(
p_input
,
"state"
,
StateChange
,
p_intf
);
/* We format the string to be displayed */
psz_buf
=
str_format_meta
(
p_this
,
p_intf
->
p_sys
->
psz_format
);
psz_buf
=
str_format_meta
(
(
vlc_object_t
*
)
p_intf
,
p_intf
->
p_sys
->
psz_format
);
/* We don't need the input anymore */
vlc_object_release
(
p_input
);
...
...
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