summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Cellerier <dionoea@videolan.org>2007-12-15 17:14:04 +0000
committerAntoine Cellerier <dionoea@videolan.org>2007-12-15 17:14:04 +0000
commita6d4e531a360bdd1f13592936ca7cf7a7f4b2633 (patch)
tree31ef1fbee156671b77c43a476ee4816114ecf8be
parent4a2a45f400a8c5e242e1fd40f92f3a6ac18b215d (diff)
downloadrockbox-a6d4e531a360bdd1f13592936ca7cf7a7f4b2633.zip
rockbox-a6d4e531a360bdd1f13592936ca7cf7a7f4b2633.tar.gz
rockbox-a6d4e531a360bdd1f13592936ca7cf7a7f4b2633.tar.bz2
rockbox-a6d4e531a360bdd1f13592936ca7cf7a7f4b2633.tar.xz
Patch "Remain in PLViewer when move_track is canceled", by Lee Kang Hyuk. Closes FS#8322.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15937 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playlist_viewer.c12
-rw-r--r--docs/CREDITS1
2 files changed, 12 insertions, 1 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index b00e1eb..db9c974 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -640,8 +640,18 @@ bool playlist_viewer_ex(char* filename)
{
case ACTION_TREE_WPS:
case ACTION_STD_CANCEL:
- exit = true;
+ {
+ if (viewer.move_track >= 0)
+ {
+ viewer.selected_track = viewer.move_track;
+ gui_synclist_select_item(&playlist_lists, viewer.move_track);
+ viewer.move_track = -1;
+ gui_synclist_draw(&playlist_lists);
+ }
+ else
+ exit = true;
break;
+ }
case ACTION_STD_OK:
{
struct playlist_entry * current_track =
diff --git a/docs/CREDITS b/docs/CREDITS
index da819bb..c93fcfa 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -354,6 +354,7 @@ Gerritt Gonzales
Martin Crkovský
Ariya Hidayat
Jonas Hurrelmann
+Lee Kang Hyuk
The libmad team
The wavpack team