diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-08-19 11:55:30 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-08-19 11:55:30 +0000 |
commit | ddc2176b4d77c96e1f223dc5d1e38241f3ab6ffe (patch) | |
tree | f876873e8aaf19f214c3e89c0a88ee9014e7a58d | |
parent | 209245605b082e83a86c9c376561650671a60e43 (diff) | |
download | rockbox-ddc2176b4d77c96e1f223dc5d1e38241f3ab6ffe.tar.gz rockbox-ddc2176b4d77c96e1f223dc5d1e38241f3ab6ffe.zip |
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
-rw-r--r-- | apps/filetree.c | 8 |
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) | |||
90 | */ | 90 | */ |
91 | bool ft_play_playlist(char* pathname, char* dirname, char* filename) | 91 | bool ft_play_playlist(char* pathname, char* dirname, char* filename) |
92 | { | 92 | { |
93 | if (global_settings.party_mode) | 93 | if (global_settings.party_mode && audio_status()) |
94 | { | 94 | { |
95 | splash(HZ, ID2P(LANG_PARTY_MODE)); | 95 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
96 | return false; | 96 | return false; |
@@ -404,7 +404,7 @@ int ft_enter(struct tree_context* c) | |||
404 | if (!warn_on_pl_erase()) | 404 | if (!warn_on_pl_erase()) |
405 | break; | 405 | break; |
406 | 406 | ||
407 | if (global_settings.party_mode) | 407 | if (global_settings.party_mode && audio_status()) |
408 | { | 408 | { |
409 | playlist_insert_track(NULL, buf, | 409 | playlist_insert_track(NULL, buf, |
410 | PLAYLIST_INSERT_LAST, true, true); | 410 | PLAYLIST_INSERT_LAST, true, true); |
@@ -529,7 +529,7 @@ int ft_enter(struct tree_context* c) | |||
529 | 529 | ||
530 | /* plugin file */ | 530 | /* plugin file */ |
531 | case FILE_ATTR_ROCK: | 531 | case FILE_ATTR_ROCK: |
532 | if (global_settings.party_mode) { | 532 | if (global_settings.party_mode && audio_status()) { |
533 | splash(HZ, ID2P(LANG_PARTY_MODE)); | 533 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
534 | break; | 534 | break; |
535 | } | 535 | } |
@@ -553,7 +553,7 @@ int ft_enter(struct tree_context* c) | |||
553 | { | 553 | { |
554 | const char* plugin; | 554 | const char* plugin; |
555 | 555 | ||
556 | if (global_settings.party_mode) { | 556 | if (global_settings.party_mode && audio_status()) { |
557 | splash(HZ, ID2P(LANG_PARTY_MODE)); | 557 | splash(HZ, ID2P(LANG_PARTY_MODE)); |
558 | break; | 558 | break; |
559 | } | 559 | } |