From 8cb665cae829bf4eb1e7995ac89e02491fac7e8c Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Wed, 5 Feb 2025 03:01:29 +0100 Subject: [PATCH] Lib: Fix nullpointer in RacePickCard/SubstitutionCard preview handler --- src/lib/components/cards/RacePickCard.svelte | 5 ++++- src/lib/components/cards/SubstitutionCard.svelte | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/components/cards/RacePickCard.svelte b/src/lib/components/cards/RacePickCard.svelte index f7f7ed6..6203e89 100644 --- a/src/lib/components/cards/RacePickCard.svelte +++ b/src/lib/components/cards/RacePickCard.svelte @@ -37,7 +37,10 @@ const src: string = get_by_value(await data.drivers, "code", target.value)?.headshot_url || ""; - (document.getElementById("headshot_preview") as HTMLImageElement).src = src; + const img = document.getElementById("headshot_preview") as HTMLImageElement; + + // Can be null if lazyimg not loaded + if (img) img.src = src; }; const required: boolean = $derived(!racepick); diff --git a/src/lib/components/cards/SubstitutionCard.svelte b/src/lib/components/cards/SubstitutionCard.svelte index f512587..737c045 100644 --- a/src/lib/components/cards/SubstitutionCard.svelte +++ b/src/lib/components/cards/SubstitutionCard.svelte @@ -37,7 +37,10 @@ const src: string = get_by_value(await data.drivers, "code", target.value)?.headshot_url ?? ""; - (document.getElementById("headshot_preview") as HTMLImageElement).src = src; + const img = document.getElementById("headshot_preview") as HTMLImageElement; + + // Can be null if lazyimage hasn't loaded + if (img) img.src = src; }; const active_drivers = (drivers: Driver[]): Driver[] =>