summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-08-19 11:55:30 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-08-19 11:55:30 +0000
commitddc2176b4d77c96e1f223dc5d1e38241f3ab6ffe (patch)
treef876873e8aaf19f214c3e89c0a88ee9014e7a58d /apps
parent209245605b082e83a86c9c376561650671a60e43 (diff)
workaround for FS#8748 (possibly others) where playback might freeze or get confused if you try starting a new playlist when party mode is enabled.
It now will ignore the setting if you try starting playback if there is nothing already playing. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18315 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/filetree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/filetree.c b/apps/filetree.c
index 2b883db8ea..7ab0e6d0cf 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -90,7 +90,7 @@ int ft_build_playlist(struct tree_context* c, int start_index)
*/
bool ft_play_playlist(char* pathname, char* dirname, char* filename)
{
- if (global_settings.party_mode)
+ if (global_settings.party_mode && audio_status())
{
splash(HZ, ID2P(LANG_PARTY_MODE));
return false;
@@ -404,7 +404,7 @@ int ft_enter(struct tree_context* c)
if (!warn_on_pl_erase())
break;
- if (global_settings.party_mode)
+ if (global_settings.party_mode && audio_status())
{
playlist_insert_track(NULL, buf,
PLAYLIST_INSERT_LAST, true, true);
@@ -529,7 +529,7 @@ int ft_enter(struct tree_context* c)
/* plugin file */
case FILE_ATTR_ROCK:
- if (global_settings.party_mode) {
+ if (global_settings.party_mode && audio_status()) {
splash(HZ, ID2P(LANG_PARTY_MODE));
break;
}
@@ -553,7 +553,7 @@ int ft_enter(struct tree_context* c)
{
const char* plugin;
- if (global_settings.party_mode) {
+ if (global_settings.party_mode && audio_status()) {
splash(HZ, ID2P(LANG_PARTY_MODE));
break;
}