From 5bb9834817ab14aba2517f7ff76bb5eb97ea0bee Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 29 Nov 2023 23:51:08 +0100 Subject: Use findImgSrc in setSide --- webAO/viewport/utils/setSide.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'webAO/viewport/utils') diff --git a/webAO/viewport/utils/setSide.ts b/webAO/viewport/utils/setSide.ts index bff3ba5..77d1744 100644 --- a/webAO/viewport/utils/setSide.ts +++ b/webAO/viewport/utils/setSide.ts @@ -2,7 +2,7 @@ import { positions } from '../constants/positions' import { AO_HOST } from '../../client/aoHost' import { client } from '../../client' import tryUrls from '../../utils/tryUrls'; -import fileExists from '../../utils/fileExists'; +import findImgSrc from '../../utils/findImgSrc'; /** * Changes the viewport background based on a given position. @@ -59,10 +59,12 @@ export const set_side = async ({ } if (showDesk === true && desk) { - const deskFilename = (await fileExists(client.viewport.getBackgroundFolder() + desk.ao2)) - ? desk.ao2 - : desk.ao1; - bench.src = client.viewport.getBackgroundFolder() + deskFilename; + const bg_folder = client.viewport.getBackgroundFolder(); + const urls_to_try = [ + bg_folder + desk.ao2, + bg_folder + desk.ao1, + ]; + bench.src = await findImgSrc(urls_to_try); bench.style.opacity = "1"; } else { bench.style.opacity = "0"; -- cgit