1 files changed, 12 insertions, 6 deletions

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)
 struct info_data
 
 {
-    unsigned long size[NUM_VOLUMES];
-    unsigned long free[NUM_VOLUMES];
+    sector_t size[NUM_VOLUMES];
+    sector_t free[NUM_VOLUMES];
     unsigned long name[NUM_VOLUMES];
     bool new_data;
 };
@@ -163,15 +163,18 @@ enum infoscreenorder
 static int refresh_data(struct info_data *info)
 {
     int i = 0;
+#ifdef HAVE_MULTIVOLUME
 #ifdef HAVE_MULTIDRIVE
-    int drive;
     int max = -1;
-
+#endif
+    int drive = 0;
     for (i = 0 ; CHECK_VOL(i) ; i++) {
 #endif
         volume_size(IF_MV(i,) &info->size[i], &info->free[i]);
+#ifdef HAVE_MULTIVOLUME
 #ifdef HAVE_MULTIDRIVE
         drive = volume_drive(i);
+#endif
         if (drive > 0 || info->size[i] == 0)
             info->name[i] = LANG_DISK_NAME_MMC;
         else
@@ -182,9 +185,12 @@ static int refresh_data(struct info_data *info)
             max = drive;
         else if (drive < max)
             break;
+#elif defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA))
+        if (volume_partition(i) == -1)
+            break;
+#endif
+#ifdef HAVE_MULTIVOLUME
     }
-#else
-    i++;
 #endif
 
     info->new_data = false;