forked from len0rd/rockbox
Fix bug introduced in r21616 (my bad)- playlist moving array could show in playlist viewer even when track not being moved
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21704 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
4e965b4b6c
commit
be0cd7310a
1 changed files with 5 additions and 0 deletions
|
|
@ -348,6 +348,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
|
||||||
playlist_buffer_init(&viewer->buffer, buffer, buffer_size );
|
playlist_buffer_init(&viewer->buffer, buffer, buffer_size );
|
||||||
|
|
||||||
viewer->moving_track = -1;
|
viewer->moving_track = -1;
|
||||||
|
viewer->moving_playlist_index = -1;
|
||||||
|
|
||||||
if (!reload)
|
if (!reload)
|
||||||
{
|
{
|
||||||
|
|
@ -459,6 +460,7 @@ static int onplay_menu(int index)
|
||||||
{
|
{
|
||||||
/* Abort current move */
|
/* Abort current move */
|
||||||
viewer.moving_track = -1;
|
viewer.moving_track = -1;
|
||||||
|
viewer.moving_playlist_index = -1;
|
||||||
|
|
||||||
switch (result)
|
switch (result)
|
||||||
{
|
{
|
||||||
|
|
@ -642,6 +644,7 @@ bool playlist_viewer_ex(const char* filename)
|
||||||
gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks);
|
gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks);
|
||||||
/* Abort move on playlist change */
|
/* Abort move on playlist change */
|
||||||
viewer.moving_track = -1;
|
viewer.moving_track = -1;
|
||||||
|
viewer.moving_playlist_index = -1;
|
||||||
gui_synclist_draw(&playlist_lists);
|
gui_synclist_draw(&playlist_lists);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -670,6 +673,7 @@ bool playlist_viewer_ex(const char* filename)
|
||||||
viewer.selected_track = viewer.moving_track;
|
viewer.selected_track = viewer.moving_track;
|
||||||
gui_synclist_select_item(&playlist_lists, viewer.moving_track);
|
gui_synclist_select_item(&playlist_lists, viewer.moving_track);
|
||||||
viewer.moving_track = -1;
|
viewer.moving_track = -1;
|
||||||
|
viewer.moving_playlist_index = -1;
|
||||||
gui_synclist_draw(&playlist_lists);
|
gui_synclist_draw(&playlist_lists);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
@ -694,6 +698,7 @@ bool playlist_viewer_ex(const char* filename)
|
||||||
str(LANG_FAILED));
|
str(LANG_FAILED));
|
||||||
update_playlist(true);
|
update_playlist(true);
|
||||||
viewer.moving_track = -1;
|
viewer.moving_track = -1;
|
||||||
|
viewer.moving_playlist_index = -1;
|
||||||
}
|
}
|
||||||
else if (!viewer.playlist)
|
else if (!viewer.playlist)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue