Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix FS#9660 - make warn on playlist erase work correctly when creating a new playlist from the database (a bit of a hack, but not bad enough to outright reject)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24089 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2009-12-21 05:44:00 +00:00
parent 65f18a7044
commit 6643a3bc74
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/playlist.c
View file

@ -2776,7 +2776,10 @@ int playlist_set_current(struct playlist_info* playlist)
return 0;
}
struct playlist_info *playlist_get_current(void)
{
return &current_playlist;
}
/*
* Close files and delete control file for non-current playlist.
*/

1
apps/playlist.h
View file

@ -135,6 +135,7 @@ int playlist_update_resume_info(const struct mp3entry* id3);
int playlist_get_display_index(void);
int playlist_amount(void);
void playlist_set_last_shuffled_start(void);
struct playlist_info *playlist_get_current(void);
/* Exported functions for all playlists. Pass NULL for playlist_info
structure to work with current playlist. */

3
apps/tagtree.c
View file

@ -1507,7 +1507,6 @@ int tagtree_enter(struct tree_context* c)
allow user to cancel the operation */
if (!warn_on_pl_erase())
break;
if (tagtree_play_folder(c) >= 0)
rc = 2;
break;
@ -1729,7 +1728,7 @@ static int tagtree_play_folder(struct tree_context* c)
gui_synclist_select_item(&tree_lists, c->selected_item);
playlist_start(c->selected_item,0);
playlist_get_current()->num_inserted_tracks = 0; /* make warn on playlist erase work */
return 0;
}