From 51fe1b670551e866e5c78083a32b3187d7876bb5 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 28 Jul 2019 09:24:40 -0400 Subject: [PATCH] volume_ismounted is gated by HAVE_DIRCACHE rather than HAVE_MULTIVOLUME Should fix the various sim builds. Change-Id: I1dc5e8228698afb32c84ada2aa916e52e19f49d7 --- apps/menus/main_menu.c | 2 +- firmware/export/mv.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 00959d074d..f71632099d 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -310,7 +310,7 @@ static int info_speak_item(int selected_item, void * data) if (info->new_data) { volume_size(IF_MV(0,) &info->size, &info->free); -#ifdef HAVE_MULTIVOLUME +#ifdef HAVE_DIRCACHE if (volume_ismounted(1)) volume_size(1, &info->size2, &info->free2); else diff --git a/firmware/export/mv.h b/firmware/export/mv.h index 620d77d30d..ec7b2efdbd 100644 --- a/firmware/export/mv.h +++ b/firmware/export/mv.h @@ -100,7 +100,9 @@ void volume_recalc_free(IF_MV_NONVOID(int volume)); unsigned int volume_get_cluster_size(IF_MV_NONVOID(int volume)); void volume_size(IF_MV(int volume,) unsigned long *size, unsigned long *free); +#ifdef HAVE_DIRCACHE bool volume_ismounted(IF_MV_NONVOID(int volume)); +#endif #ifdef HAVE_HOTSWAP bool volume_removable(int volume); bool volume_present(int volume);