forked from len0rd/rockbox
revert r30226, which is apparently broken.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30232 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
935d3d717f
commit
94b4a8bb9a
2 changed files with 1 additions and 5 deletions
|
|
@ -3796,8 +3796,4 @@ void audio_init(void)
|
||||||
#endif
|
#endif
|
||||||
codec_thread_resume();
|
codec_thread_resume();
|
||||||
thread_thaw(audio_thread_id);
|
thread_thaw(audio_thread_id);
|
||||||
|
|
||||||
/* Load the old playlist, to ensure that behaviour with and without
|
|
||||||
* rebooting is consistent */
|
|
||||||
playlist_resume();
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
|
||||||
size_t buffer_size;
|
size_t buffer_size;
|
||||||
bool is_playing = audio_status() & (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE);
|
bool is_playing = audio_status() & (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE);
|
||||||
bool have_list = filename || is_playing;
|
bool have_list = filename || is_playing;
|
||||||
if (!have_list)
|
if (!have_list && (global_status.resume_index != -1))
|
||||||
{
|
{
|
||||||
/* Try to restore the list from control file */
|
/* Try to restore the list from control file */
|
||||||
have_list = (playlist_resume() != -1);
|
have_list = (playlist_resume() != -1);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue