Skip to content

V
vlc
Commit 65c56bb9 authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Fix playlist crash on quit

parent d90a5fa3
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 19 deletions
src/playlist/tree.c
View file @ 65c56bb9
...@@ -155,27 +155,15 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root, ...@@ -155,27 +155,15 @@ int playlist_NodeDelete( playlist_t *p_playlist, playlist_item_t *p_root,
else else
{ {
var_SetInteger( p_playlist, "item-deleted", p_root->p_input->i_id ); var_SetInteger( p_playlist, "item-deleted", p_root->p_input->i_id );
for( i = 0 ; i< p_playlist->i_all_size; i ++ )
i_bottom = 0; i_top = p_playlist->i_all_size - 1;
i = i_top / 2;
while( p_playlist->pp_all_items[i]->p_input->i_id !=
p_root->p_input->i_id && i_top > i_bottom )
{
if( p_playlist->pp_all_items[i]->p_input->i_id <
p_root->p_input->i_id )
{
i_bottom = i + 1;
}
else
{ {
i_top = i - 1;
}
i = i_bottom + ( i_top - i_bottom ) / 2;
}
if( p_playlist->pp_all_items[i]->p_input->i_id == if( p_playlist->pp_all_items[i]->p_input->i_id ==
p_root->p_input->i_id ) p_root->p_input->i_id )
{ {
REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size, i ); REMOVE_ELEM( p_playlist->pp_all_items, p_playlist->i_all_size,
i );
break;
}
} }
/* Remove the item from its parent */ /* Remove the item from its parent */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment