From 39c72386fa2180a74be717416dffbbe7398321a9 Mon Sep 17 00:00:00 2001
From: Jaime Idolpx <jaime@idolpx.com>
Date: Mon, 8 Jun 2026 20:03:19 -0400
Subject: [PATCH] fix(MediaManager): resolve base_url handling and improve path
 resolution logic

---
 src/app/components/MediaManager.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/components/MediaManager.tsx b/src/app/components/MediaManager.tsx
index 3465523..a174b52 100644
--- a/src/app/components/MediaManager.tsx
+++ b/src/app/components/MediaManager.tsx
@@ -781,8 +781,14 @@ export default function MediaManager({ initialPath = '/', rootPath, title, confi
 
     if (!dev.enabled) dev.enabled = 1;
     if (folderConfig?.['base_url']) {
-      dev.base_url = folderConfig['base_url'] === '.' ? path : folderConfig['base_url'];
-      delete dev.url;
+      const resolvedBase = (folderConfig['base_url'] === '.' ? path : folderConfig['base_url']).replace(/\/$/, '');
+      if (mountEntry.path.startsWith(resolvedBase + '/') || mountEntry.path === resolvedBase) {
+        dev.base_url = resolvedBase;
+        dev.url = mountEntry.path.slice(resolvedBase.length) || '/';
+      } else {
+        delete dev.base_url;
+        // dev.url already set to mountEntry.path above
+      }
     }
     if (folderConfig?.['cache'] === '.') dev.cache = path;
     setConfig(newConfig);