summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-11-16 11:32:12 -0500
committerSolomon Peachy <pizza@shaftnet.org>2020-11-16 17:11:38 +0000
commit9c68c69cf029b22587f4a7225261a45e5391a242 (patch)
tree378ca94924c6448a521a73f139e211d1e80730f4 /apps/settings.c
parent525252393718a74dd38895a1a945fa4cbf223bbd (diff)
downloadrockbox-9c68c69cf029b22587f4a7225261a45e5391a242.tar.gz
rockbox-9c68c69cf029b22587f4a7225261a45e5391a242.zip
FS13257: Fix inconsistent defaults in the USB mode selection
Change-Id: I44894d13f070313ad326ce68018556573e35aad9
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c
index b72808b510..59cb480c95 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1025,6 +1025,10 @@ void settings_apply(bool read_disk)
1025 usb_charging_enable(global_settings.usb_charging); 1025 usb_charging_enable(global_settings.usb_charging);
1026#endif 1026#endif
1027 1027
1028#ifdef HAVE_USB_POWER
1029 usb_set_mode(global_settings.usb_mode);
1030#endif
1031
1028#ifdef HAVE_TOUCHSCREEN 1032#ifdef HAVE_TOUCHSCREEN
1029 touchscreen_set_mode(global_settings.touch_mode); 1033 touchscreen_set_mode(global_settings.touch_mode);
1030 memcpy(&calibration_parameters, &global_settings.ts_calibration_data, sizeof(struct touchscreen_parameter)); 1034 memcpy(&calibration_parameters, &global_settings.ts_calibration_data, sizeof(struct touchscreen_parameter));