diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-08-05 21:14:41 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-08-05 21:15:40 -0400 |
commit | 0544d974f9283602ef7ca922552f29667579bcb3 (patch) | |
tree | bf0a93431bef2292d962e68b3bd873ec7e224742 /apps | |
parent | ed724fecb15d90d8075ed1edb963f455cb91b0a1 (diff) | |
download | rockbox-0544d974f9283602ef7ca922552f29667579bcb3.tar.gz rockbox-0544d974f9283602ef7ca922552f29667579bcb3.zip |
Fix rockbox info screen on non-MULTIVOLUME targets
Regression introduced in c3a775c05b70ea538076c3f02909137e9474c52e
Change-Id: Idd069d6325e3403b4de445856184758d3f8230a5
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menus/main_menu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 6e63951319..90c8c1d7fc 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -160,13 +160,13 @@ enum infoscreenorder | |||
160 | */ | 160 | */ |
161 | static int refresh_data(struct info_data *info) | 161 | static int refresh_data(struct info_data *info) |
162 | { | 162 | { |
163 | int i; | 163 | int i = 0; |
164 | #ifdef HAVE_MULTIDRIVE | 164 | #ifdef HAVE_MULTIDRIVE |
165 | int drive; | 165 | int drive; |
166 | int max = -1; | 166 | int max = -1; |
167 | #endif | ||
168 | 167 | ||
169 | for (i = 0 ; CHECK_VOL(i) ; i++) { | 168 | for (i = 0 ; CHECK_VOL(i) ; i++) { |
169 | #endif | ||
170 | volume_size(IF_MV(i,) &info->size[i], &info->free[i]); | 170 | volume_size(IF_MV(i,) &info->size[i], &info->free[i]); |
171 | #ifdef HAVE_MULTIDRIVE | 171 | #ifdef HAVE_MULTIDRIVE |
172 | drive = volume_drive(i); | 172 | drive = volume_drive(i); |
@@ -180,8 +180,11 @@ static int refresh_data(struct info_data *info) | |||
180 | max = drive; | 180 | max = drive; |
181 | else if (drive < max) | 181 | else if (drive < max) |
182 | break; | 182 | break; |
183 | #endif | ||
184 | } | 183 | } |
184 | #else | ||
185 | i++; | ||
186 | #endif | ||
187 | |||
185 | info->new_data = false; | 188 | info->new_data = false; |
186 | return i; | 189 | return i; |
187 | } | 190 | } |