diff options
| author | Nils Wallménius <nils@rockbox.org> | 2008-12-28 12:37:03 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2008-12-28 12:37:03 +0000 |
| commit | 7036d72a408ce189c7a0e8e139aaaf8b8db84463 (patch) | |
| tree | b181eae0af6235836981329babe5aa469abdf0b6 /apps | |
| parent | 34c9b111389e2069ad7397163d0eb8bc5b5cc4e4 (diff) | |
| download | rockbox-7036d72a408ce189c7a0e8e139aaaf8b8db84463.zip rockbox-7036d72a408ce189c7a0e8e139aaaf8b8db84463.tar.gz rockbox-7036d72a408ce189c7a0e8e139aaaf8b8db84463.tar.bz2 rockbox-7036d72a408ce189c7a0e8e139aaaf8b8db84463.tar.xz | |
Move enabling of USB charging from sound_settings_apply to settings_apply
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19605 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings.c b/apps/settings.c index 47849cb..b6c721c 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -725,10 +725,6 @@ void sound_settings_apply(void) sound_set(SOUND_BASS_CUTOFF, global_settings.bass_cutoff); sound_set(SOUND_TREBLE_CUTOFF, global_settings.treble_cutoff); #endif - -#ifdef HAVE_USB_CHARGING_ENABLE - usb_charging_enable(global_settings.usb_charging); -#endif } void settings_apply(bool read_disk) @@ -958,6 +954,10 @@ void settings_apply(bool read_disk) touchpad_set_sensitivity(global_settings.touchpad_sensitivity); #endif +#ifdef HAVE_USB_CHARGING_ENABLE + usb_charging_enable(global_settings.usb_charging); +#endif + /* This should stay last */ #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC enc_global_settings_apply(); |