From 9e8918b0866b249a55c06a16a243cdd3dcdad305 Mon Sep 17 00:00:00 2001 From: Christi Scarborough Date: Wed, 29 Jun 2005 12:23:09 +0000 Subject: Resume rework. With the new resume function, 'Ask' and 'Ask Once' are redundant options, since you can resume after any startup using the resume key. These have been stripped out, and the resume code has been streamlined. A small bug in button handler initialisation has been fixed. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6911 a1c6a512-1295-4272-9138-f99709370657 --- apps/wps.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'apps/wps.c') diff --git a/apps/wps.c b/apps/wps.c index be0ad448dd..40c9194793 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -252,7 +252,6 @@ static bool update(void) /* save resume data */ if ( id3 && - global_settings.resume && global_settings.resume_offset != id3->offset ) { if (!playlist_get_resume_info(&global_settings.resume_index)) @@ -391,7 +390,7 @@ long wps_show(void) /* if another thread paused audio, we are probably in car mode, about to shut down. lets save the settings. */ - if (paused && global_settings.resume) { + if (paused) { settings_save(); #ifndef HAVE_RTC ata_flush(); @@ -544,12 +543,10 @@ long wps_show(void) fade(0); else audio_pause(); - if (global_settings.resume) { - settings_save(); + settings_save(); #ifndef HAVE_RTC - ata_flush(); + ata_flush(); #endif - } } break; -- cgit v1.2.3