diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2007-05-14 04:44:55 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2007-05-14 04:44:55 +0000 |
commit | 2ac037d7c582dabf31b5ae49a5a5d6a094453b0f (patch) | |
tree | fdd69c0a6208895dce5b4c5e956964e0f4ecb4e3 /apps | |
parent | 9eeb0ada6a45027010e0e99ad0bc399e4f4de6a2 (diff) | |
download | rockbox-2ac037d7c582dabf31b5ae49a5a5d6a094453b0f.tar.gz rockbox-2ac037d7c582dabf31b5ae49a5a5d6a094453b0f.zip |
Set the brightness before setting the timeout values for the backlight and buttonlights
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13382 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 81dbe71491..aa8afe472c 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -700,6 +700,9 @@ void settings_apply(void) remote_backlight_set_on_button_hold(global_settings.remote_backlight_on_button_hold); #endif #endif /* HAVE_REMOTE_LCD */ +#ifdef HAVE_BACKLIGHT_BRIGHTNESS + backlight_set_brightness(global_settings.brightness); +#endif #ifdef HAVE_BACKLIGHT backlight_set_timeout(global_settings.backlight_timeout); #if CONFIG_CHARGING @@ -710,14 +713,11 @@ void settings_apply(void) backlight_set_fade_out(global_settings.backlight_fade_out); #endif #endif -#ifdef HAVE_BUTTON_LIGHT - button_backlight_set_timeout(global_settings.button_light_timeout); -#endif #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS buttonlight_set_brightness(global_settings.buttonlight_brightness); #endif -#ifdef HAVE_BACKLIGHT_BRIGHTNESS - backlight_set_brightness(global_settings.brightness); +#ifdef HAVE_BUTTON_LIGHT + button_backlight_set_timeout(global_settings.button_light_timeout); #endif ata_spindown(global_settings.disk_spindown); #if (CONFIG_CODEC == MAS3507D) && !defined(SIMULATOR) |