diff --git a/src/components/RequestModal/AdvancedRequester/index.tsx b/src/components/RequestModal/AdvancedRequester/index.tsx index 8aebb5af..24925253 100644 --- a/src/components/RequestModal/AdvancedRequester/index.tsx +++ b/src/components/RequestModal/AdvancedRequester/index.tsx @@ -158,7 +158,7 @@ const AdvancedRequester = ({ useEffect(() => { let defaultServer = data?.find( - (server) => server.isDefault && is4k === server.is4k + (server) => server.isDefault && (type === 'music' || is4k === server.is4k) ); if (!defaultServer && (data ?? []).length > 0) { @@ -299,7 +299,8 @@ const AdvancedRequester = ({ if ( (!data || selectedServer === null || - (data.filter((server) => server.is4k === is4k).length < 2 && + (data.filter((server) => type === 'music' || server.is4k === is4k) + .length < 2 && (!serverData || (serverData.profiles.length < 2 && serverData.rootFolders.length < 2 && @@ -318,7 +319,9 @@ const AdvancedRequester = ({
{!!data && selectedServer !== null && (
- {data.filter((server) => server.is4k === is4k).length > 1 && ( + {((type === 'music' && data.length > 1) || + (type !== 'music' && + data.filter((server) => server.is4k === is4k).length > 1)) && (
)} {(isValidating || !serverData || - serverData.profiles.length > 1) && ( + (serverData.profiles.length > 1 && + (!serverData.server.isDefault || type !== 'music'))) && (