Backport r31083 - playlist handling: revert part of r30177.

loading a .m3u from the filebrowser now just runs it like it used to, selecting a playlist from inside the catalogue viewer opens it instead.


git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_10@31110 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Chicoine 2011-12-02 16:41:36 +00:00
parent 8f96be4857
commit df1b8ed8b6

View file

@ -44,7 +44,6 @@
#include "filetree.h"
#include "misc.h"
#include "strnatcmp.h"
#include "playlist_viewer.h"
#ifdef HAVE_LCD_BITMAP
#include "keyboard.h"
#endif
@ -461,8 +460,13 @@ int ft_enter(struct tree_context* c)
switch ( file_attr & FILE_ATTR_MASK ) {
case FILE_ATTR_M3U:
if (!bookmark_autoload(buf))
playlist_viewer_ex(buf);
play = ft_play_playlist(buf, c->currdir, file->name);
if (play)
{
start_index = 0;
}
break;
case FILE_ATTR_AUDIO: