From 13830439fae202247626e5ebfd7fe3d57d7c5628 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 26 Jul 2024 10:44:38 -0400
Subject: Fix multidrive/multivolume hosted builds.

Generalize the fix in 2348779ae6 to apply to hosted as well as simulator
builds.  Original regression introduced in c0ac043c6d

Change-Id: Ia786533cc318555e3bb842eb21a73a1f76888379
---
 apps/main.c                    | 9 +++++++++
 uisimulator/common/sim_tasks.c | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/main.c b/apps/main.c
index 0a104576e1..4c7689ce8c 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -131,6 +131,12 @@
 #define MAIN_NORETURN_ATTR
 #endif
 
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
+#ifdef HAVE_MULTIVOLUME
+#include "pathfuncs.h" /* for init_volume_names */
+#endif
+#endif
+
 #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
 #ifdef SIMULATOR
 #include "sim_tasks.h"
@@ -381,6 +387,9 @@ static void init(void)
     powermgmt_init();
     backlight_init();
     unicode_init();
+#ifdef HAVE_MULTIVOLUME
+    init_volume_names();
+#endif
 #ifdef SIMULATOR
     sim_tasks_init();
 #endif
diff --git a/uisimulator/common/sim_tasks.c b/uisimulator/common/sim_tasks.c
index 1d933e63a2..1f7e3bffcf 100644
--- a/uisimulator/common/sim_tasks.c
+++ b/uisimulator/common/sim_tasks.c
@@ -30,9 +30,6 @@
 #include "usb.h"
 #include "mv.h"
 #include "ata_idle_notify.h"
-#ifdef HAVE_MULTIVOLUME
-#include "pathfuncs.h" /* for init_volume_names */
-#endif
 
 #ifdef WIN32
 #include <windows.h>
@@ -137,9 +134,6 @@ void sim_thread(void)
 
 void sim_tasks_init(void)
 {
-#ifdef HAVE_MULTIVOLUME
-    init_volume_names();
-#endif
     queue_init(&sim_queue, false);
 
     create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0,
-- 
cgit v1.2.3