forked from len0rd/rockbox
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
This commit is contained in:
parent
34c9b11138
commit
7036d72a40
1 changed files with 4 additions and 4 deletions
|
|
@ -725,10 +725,6 @@ void sound_settings_apply(void)
|
||||||
sound_set(SOUND_BASS_CUTOFF, global_settings.bass_cutoff);
|
sound_set(SOUND_BASS_CUTOFF, global_settings.bass_cutoff);
|
||||||
sound_set(SOUND_TREBLE_CUTOFF, global_settings.treble_cutoff);
|
sound_set(SOUND_TREBLE_CUTOFF, global_settings.treble_cutoff);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_USB_CHARGING_ENABLE
|
|
||||||
usb_charging_enable(global_settings.usb_charging);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void settings_apply(bool read_disk)
|
void settings_apply(bool read_disk)
|
||||||
|
|
@ -958,6 +954,10 @@ void settings_apply(bool read_disk)
|
||||||
touchpad_set_sensitivity(global_settings.touchpad_sensitivity);
|
touchpad_set_sensitivity(global_settings.touchpad_sensitivity);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_USB_CHARGING_ENABLE
|
||||||
|
usb_charging_enable(global_settings.usb_charging);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* This should stay last */
|
/* This should stay last */
|
||||||
#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
|
#if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
|
||||||
enc_global_settings_apply();
|
enc_global_settings_apply();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue