diff options
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/display_menu.c | 5 | ||||
-rw-r--r-- | apps/menus/main_menu.c | 18 |
2 files changed, 16 insertions, 7 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index c5c5e6d908..2ce566a888 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -331,6 +331,7 @@ MENUITEM_SETTING(list_accel_start_delay, | |||
331 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | 331 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); |
332 | #endif /* HAVE_WHEEL_ACCELERATION */ | 332 | #endif /* HAVE_WHEEL_ACCELERATION */ |
333 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL); | 333 | MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL); |
334 | MENUITEM_SETTING(disable_mainmenu_scrolling, &global_settings.disable_mainmenu_scrolling, NULL); | ||
334 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); | 335 | MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); |
335 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); | 336 | MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); |
336 | MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, NULL); | 337 | MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, NULL); |
@@ -343,7 +344,9 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | |||
343 | #ifdef HAVE_REMOTE_LCD | 344 | #ifdef HAVE_REMOTE_LCD |
344 | &remote_scroll_sets, | 345 | &remote_scroll_sets, |
345 | #endif | 346 | #endif |
346 | &offset_out_of_view, &screen_scroll_step, | 347 | &offset_out_of_view, |
348 | &disable_mainmenu_scrolling, | ||
349 | &screen_scroll_step, | ||
347 | &scroll_paginated, | 350 | &scroll_paginated, |
348 | &list_wraparound, | 351 | &list_wraparound, |
349 | &list_order, | 352 | &list_order, |
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index a483a72eb0..2fa5be5623 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -134,8 +134,8 @@ static int show_legal(void) | |||
134 | struct info_data | 134 | struct info_data |
135 | 135 | ||
136 | { | 136 | { |
137 | unsigned long size[NUM_VOLUMES]; | 137 | sector_t size[NUM_VOLUMES]; |
138 | unsigned long free[NUM_VOLUMES]; | 138 | sector_t free[NUM_VOLUMES]; |
139 | unsigned long name[NUM_VOLUMES]; | 139 | unsigned long name[NUM_VOLUMES]; |
140 | bool new_data; | 140 | bool new_data; |
141 | }; | 141 | }; |
@@ -163,15 +163,18 @@ enum infoscreenorder | |||
163 | static int refresh_data(struct info_data *info) | 163 | static int refresh_data(struct info_data *info) |
164 | { | 164 | { |
165 | int i = 0; | 165 | int i = 0; |
166 | #ifdef HAVE_MULTIVOLUME | ||
166 | #ifdef HAVE_MULTIDRIVE | 167 | #ifdef HAVE_MULTIDRIVE |
167 | int drive; | ||
168 | int max = -1; | 168 | int max = -1; |
169 | 169 | #endif | |
170 | int drive = 0; | ||
170 | for (i = 0 ; CHECK_VOL(i) ; i++) { | 171 | for (i = 0 ; CHECK_VOL(i) ; i++) { |
171 | #endif | 172 | #endif |
172 | volume_size(IF_MV(i,) &info->size[i], &info->free[i]); | 173 | volume_size(IF_MV(i,) &info->size[i], &info->free[i]); |
174 | #ifdef HAVE_MULTIVOLUME | ||
173 | #ifdef HAVE_MULTIDRIVE | 175 | #ifdef HAVE_MULTIDRIVE |
174 | drive = volume_drive(i); | 176 | drive = volume_drive(i); |
177 | #endif | ||
175 | if (drive > 0 || info->size[i] == 0) | 178 | if (drive > 0 || info->size[i] == 0) |
176 | info->name[i] = LANG_DISK_NAME_MMC; | 179 | info->name[i] = LANG_DISK_NAME_MMC; |
177 | else | 180 | else |
@@ -182,9 +185,12 @@ static int refresh_data(struct info_data *info) | |||
182 | max = drive; | 185 | max = drive; |
183 | else if (drive < max) | 186 | else if (drive < max) |
184 | break; | 187 | break; |
188 | #elif defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA)) | ||
189 | if (volume_partition(i) == -1) | ||
190 | break; | ||
191 | #endif | ||
192 | #ifdef HAVE_MULTIVOLUME | ||
185 | } | 193 | } |
186 | #else | ||
187 | i++; | ||
188 | #endif | 194 | #endif |
189 | 195 | ||
190 | info->new_data = false; | 196 | info->new_data = false; |