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
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 @@
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 @@
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();