From a1b3c69a0fd3c16d09e284fb2365c69b7efdd555 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sat, 19 Apr 2008 12:31:38 +0000 Subject: [PATCH] Fixed cpu boost/unboost (in case of a plugin error, the cpu was unboosted without being boosted earlier). Also fixed possible missing cleanup in case write_pfconfig fails. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17167 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pictureflow.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/plugins/pictureflow.c b/apps/plugins/pictureflow.c index 02f0522f53..e5494d661a 100644 --- a/apps/plugins/pictureflow.c +++ b/apps/plugins/pictureflow.c @@ -1493,9 +1493,6 @@ void update_scroll_animation(void) void cleanup(void *parameter) { (void) parameter; -#ifdef HAVE_ADJUSTABLE_CPU_FREQ - rb->cpu_boost(false); -#endif /* Turn on backlight timeout (revert to settings) */ backlight_use_settings(rb); /* backlight control in lib/helper.c */ @@ -1947,9 +1944,6 @@ int main(void) char fpstxt[10]; int button; -#ifdef HAVE_ADJUSTABLE_CPU_FREQ - rb->cpu_boost(true); -#endif int frames = 0; long last_update = *rb->current_tick; long current_update; @@ -2097,11 +2091,17 @@ enum plugin_status plugin_start(struct plugin_api *api, void *parameter) #endif /* Turn off backlight timeout */ backlight_force_on(rb); /* backlight control in lib/helper.c */ +#ifdef HAVE_ADJUSTABLE_CPU_FREQ + rb->cpu_boost(true); +#endif ret = main(); +#ifdef HAVE_ADJUSTABLE_CPU_FREQ + rb->cpu_boost(false); +#endif if ( ret == PLUGIN_OK ) { if (!write_pfconfig()) { rb->splash(HZ, "Error writing config."); - return PLUGIN_ERROR; + ret = PLUGIN_ERROR; } }