From 7f77dd8c265e4e6f5dba53eeb125736f411453a2 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 25 Feb 2009 05:41:31 +0000 Subject: fix FS#9796 - playlist resume from plugins didnt work git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20101 a1c6a512-1295-4272-9138-f99709370657 --- apps/tree.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/tree.c b/apps/tree.c index 1f0b78b098..6eb64a55a6 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -477,11 +477,21 @@ static int update_dir(void) /* load tracks from specified directory to resume play */ void resume_directory(const char *dir) { + int dirfilter = *tc.dirfilter; + int ret; #ifdef HAVE_TAGCACHE bool id3db = *tc.dirfilter == SHOW_ID3DB; #endif - - if (ft_load(&tc, dir) < 0) + /* make sure the dirfilter is sane. The only time it should be possible + * thats its not is when resume playlist is called from a plugin + */ +#ifdef HAVE_TAGCACHE + if (!id3db) +#endif + *tc.dirfilter = global_settings.dirfilter; + ret = ft_load(&tc, dir); + *tc.dirfilter = dirfilter; + if (ret < 0) return; lastdir[0] = 0; -- cgit v1.2.3