From 12914e42dd7ccbab2ed85531dcd356058419f019 Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Mon, 13 Apr 2026 13:28:58 -0700 Subject: [PATCH] More fixes --- src/app/main/layout.tsx | 18 ++++++++++++------ src/popups/Downloads.tsx | 2 +- src/popups/VersionChangelog.tsx | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/app/main/layout.tsx b/src/app/main/layout.tsx index aab4596..bfb97cd 100644 --- a/src/app/main/layout.tsx +++ b/src/app/main/layout.tsx @@ -461,7 +461,12 @@ export default function RootLayout ({ const versionId = downloadQueue[0] const downloadInfo = downloadProgress.find(d => d.version == versionId) - if (!downloadInfo) return + if (!downloadInfo) { + setDownloadProgress(prev => prev.filter(d => d.version !== versionId)) + setDownloadQueue(prev => prev.slice(1)) + setIsProcessingQueue(false) + return + } const info = serverVersionList?.versions.find(vf => vf.id == versionId) if (!info) { @@ -614,22 +619,23 @@ export default function RootLayout ({ const verInfo = serverVersionList.versions.find(item => item.id === key) if ( - !verInfo || - (verInfo.lastRevision > 0 && value / 1000 <= verInfo.lastRevision) + verInfo && + verInfo.lastRevision > 0 && + value / 1000 <= verInfo.lastRevision ) { if ( - await exists('game/' + key + '/' + verInfo?.executable, { + await exists('game/' + key + '/' + verInfo.executable, { baseDir: BaseDirectory.AppLocalData }) ) - await remove('game/' + key + '/' + verInfo?.executable, { + await remove('game/' + key + '/' + verInfo.executable, { baseDir: BaseDirectory.AppLocalData, recursive: true }) } } })() - }, [serverVersionList, downloadVersions, versionsList]) + }, [serverVersionList, versionsList]) useEffect(() => { if ( diff --git a/src/popups/Downloads.tsx b/src/popups/Downloads.tsx index c9020d0..fcb91be 100644 --- a/src/popups/Downloads.tsx +++ b/src/popups/Downloads.tsx @@ -203,7 +203,7 @@ export default function DownloadsPopup () { ) : v.hash_checking ? ( - Verifying file integerty... + Verifying file integrity... ) : v.unzipping ? (
diff --git a/src/popups/VersionChangelog.tsx b/src/popups/VersionChangelog.tsx index 1e67a59..4f3b8ec 100644 --- a/src/popups/VersionChangelog.tsx +++ b/src/popups/VersionChangelog.tsx @@ -23,7 +23,7 @@ export default function VersionChangelogPopup () { dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize( atob(versionInfo?.changelog ?? '') - .replaceAll('- ', '• ') + .replace(/^- /gm, '• ') .replaceAll(/`([^`]+)`/g, '$1') ) }}