diff options
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index 800cc59a56..8835b95b12 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #if CONFIG_TUNER | 69 | #if CONFIG_TUNER |
70 | #include "radio.h" | 70 | #include "radio.h" |
71 | #endif | 71 | #endif |
72 | #include "wps_engine/wps_engine.h" | 72 | #include "skin_engine/skin_engine.h" |
73 | 73 | ||
74 | #if CONFIG_CODEC == MAS3507D | 74 | #if CONFIG_CODEC == MAS3507D |
75 | void dac_line_in(bool enable); | 75 | void dac_line_in(bool enable); |
@@ -848,11 +848,12 @@ void settings_apply(bool read_disk) | |||
848 | global_settings.wps_file[0] != 0xff ) { | 848 | global_settings.wps_file[0] != 0xff ) { |
849 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", | 849 | snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", |
850 | global_settings.wps_file); | 850 | global_settings.wps_file); |
851 | wps_data_load(gui_wps[0].data, &screens[0], buf, true); | 851 | skin_data_load(gui_wps[0].data, &screens[0], buf, true); |
852 | } | 852 | } |
853 | else | 853 | else |
854 | { | 854 | { |
855 | wps_data_init(gui_wps[0].data); | 855 | wps_data_init(gui_wps[0].data); |
856 | skin_data_load(gui_wps[0].data, &screens[0], NULL, true); | ||
856 | #ifdef HAVE_REMOTE_LCD | 857 | #ifdef HAVE_REMOTE_LCD |
857 | gui_wps[0].data->remote_wps = false; | 858 | gui_wps[0].data->remote_wps = false; |
858 | #endif | 859 | #endif |
@@ -877,11 +878,12 @@ void settings_apply(bool read_disk) | |||
877 | if ( global_settings.rwps_file[0]) { | 878 | if ( global_settings.rwps_file[0]) { |
878 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", | 879 | snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", |
879 | global_settings.rwps_file); | 880 | global_settings.rwps_file); |
880 | wps_data_load(gui_wps[1].data, &screens[1], buf, true); | 881 | skin_data_load(gui_wps[1].data, &screens[1], buf, true); |
881 | } | 882 | } |
882 | else | 883 | else |
883 | { | 884 | { |
884 | wps_data_init(gui_wps[1].data); | 885 | wps_data_init(gui_wps[1].data); |
886 | skin_data_load(gui_wps[1].data, &screens[1], NULL, true); | ||
885 | gui_wps[1].data->remote_wps = true; | 887 | gui_wps[1].data->remote_wps = true; |
886 | } | 888 | } |
887 | #endif | 889 | #endif |