From a9c519971e112e720684ac22b2ef175afde59836 Mon Sep 17 00:00:00 2001 From: retardgerman <78982850+retardgerman@users.noreply.github.com> Date: Tue, 5 Aug 2025 11:23:14 +0200 Subject: [PATCH] fix: loading conditionals (#753) (#805) --- app/(auth)/player/direct-player.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/(auth)/player/direct-player.tsx b/app/(auth)/player/direct-player.tsx index b418a139..7e0aa5c9 100644 --- a/app/(auth)/player/direct-player.tsx +++ b/app/(auth)/player/direct-player.tsx @@ -516,7 +516,18 @@ export default function page() { return () => setIsMounted(false); }, []); - if (itemStatus.isLoading || streamStatus.isLoading) { + // Show error UI first, before checking loading/missing‐data + if (itemStatus.isError || streamStatus.isError) { + return ( + + {t("player.error")} + + ); + } + + // Then show loader while either side is still fetching or data isn’t present + if (itemStatus.isLoading || streamStatus.isLoading || !item || !stream) { + // …loader UI… return (