diff options
author | Dave Hooper <dave@beermex.com> | 2009-07-07 22:40:47 +0000 |
---|---|---|
committer | Dave Hooper <dave@beermex.com> | 2009-07-07 22:40:47 +0000 |
commit | be0cd7310a5dc9e3e058e4c8235faad2bb11b220 (patch) | |
tree | 1b1853466679a4c922fc3760edc2f6c82f31184e /apps | |
parent | 4e965b4b6c22a4ed206eed418c0e1b9296cc2113 (diff) | |
download | rockbox-be0cd7310a5dc9e3e058e4c8235faad2bb11b220.tar.gz rockbox-be0cd7310a5dc9e3e058e4c8235faad2bb11b220.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playlist_viewer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 5f4c682605..7c4ee379cc 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -348,6 +348,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer, | |||
348 | playlist_buffer_init(&viewer->buffer, buffer, buffer_size ); | 348 | playlist_buffer_init(&viewer->buffer, buffer, buffer_size ); |
349 | 349 | ||
350 | viewer->moving_track = -1; | 350 | viewer->moving_track = -1; |
351 | viewer->moving_playlist_index = -1; | ||
351 | 352 | ||
352 | if (!reload) | 353 | if (!reload) |
353 | { | 354 | { |
@@ -459,6 +460,7 @@ static int onplay_menu(int index) | |||
459 | { | 460 | { |
460 | /* Abort current move */ | 461 | /* Abort current move */ |
461 | viewer.moving_track = -1; | 462 | viewer.moving_track = -1; |
463 | viewer.moving_playlist_index = -1; | ||
462 | 464 | ||
463 | switch (result) | 465 | switch (result) |
464 | { | 466 | { |
@@ -642,6 +644,7 @@ bool playlist_viewer_ex(const char* filename) | |||
642 | gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks); | 644 | gui_synclist_set_nb_items(&playlist_lists, viewer.num_tracks); |
643 | /* Abort move on playlist change */ | 645 | /* Abort move on playlist change */ |
644 | viewer.moving_track = -1; | 646 | viewer.moving_track = -1; |
647 | viewer.moving_playlist_index = -1; | ||
645 | gui_synclist_draw(&playlist_lists); | 648 | gui_synclist_draw(&playlist_lists); |
646 | } | 649 | } |
647 | 650 | ||
@@ -670,6 +673,7 @@ bool playlist_viewer_ex(const char* filename) | |||
670 | viewer.selected_track = viewer.moving_track; | 673 | viewer.selected_track = viewer.moving_track; |
671 | gui_synclist_select_item(&playlist_lists, viewer.moving_track); | 674 | gui_synclist_select_item(&playlist_lists, viewer.moving_track); |
672 | viewer.moving_track = -1; | 675 | viewer.moving_track = -1; |
676 | viewer.moving_playlist_index = -1; | ||
673 | gui_synclist_draw(&playlist_lists); | 677 | gui_synclist_draw(&playlist_lists); |
674 | } | 678 | } |
675 | else | 679 | else |
@@ -694,6 +698,7 @@ bool playlist_viewer_ex(const char* filename) | |||
694 | str(LANG_FAILED)); | 698 | str(LANG_FAILED)); |
695 | update_playlist(true); | 699 | update_playlist(true); |
696 | viewer.moving_track = -1; | 700 | viewer.moving_track = -1; |
701 | viewer.moving_playlist_index = -1; | ||
697 | } | 702 | } |
698 | else if (!viewer.playlist) | 703 | else if (!viewer.playlist) |
699 | { | 704 | { |