Fix versions config not being set right when downloading
This commit is contained in:
@@ -299,7 +299,7 @@ export default function RootLayout ({
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const downloadVersions = useCallback(
|
const downloadVersions = useCallback(
|
||||||
async (list: string[], currentConfig: VersionsConfig): Promise<void> => {
|
async (list: string[]): Promise<void> => {
|
||||||
if (list.length === 0) return
|
if (list.length === 0) return
|
||||||
setSelectedVersionList([])
|
setSelectedVersionList([])
|
||||||
|
|
||||||
@@ -350,13 +350,20 @@ export default function RootLayout ({
|
|||||||
setDownloadProgress(prev =>
|
setDownloadProgress(prev =>
|
||||||
prev.filter(d => d.version !== download.version)
|
prev.filter(d => d.version !== download.version)
|
||||||
)
|
)
|
||||||
const date = Date.now()
|
setDownloadedVersionsConfig(prev => {
|
||||||
const newConfig = {
|
if (!prev) return prev
|
||||||
...currentConfig,
|
|
||||||
list: { ...currentConfig.list, [download.version]: date }
|
const updated = {
|
||||||
}
|
...prev,
|
||||||
setDownloadedVersionsConfig(newConfig)
|
list: {
|
||||||
writeVersionsConfig(newConfig)
|
...prev.list,
|
||||||
|
[download.version]: Date.now()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
writeVersionsConfig(updated)
|
||||||
|
return updated
|
||||||
|
})
|
||||||
} else {
|
} else {
|
||||||
setDownloadProgress(prev =>
|
setDownloadProgress(prev =>
|
||||||
prev.map(d =>
|
prev.map(d =>
|
||||||
@@ -408,7 +415,7 @@ export default function RootLayout ({
|
|||||||
writeVersionsConfig(newConfig)
|
writeVersionsConfig(newConfig)
|
||||||
setSelectedVersionList(prev => [...prev, ...versionsToSelect])
|
setSelectedVersionList(prev => [...prev, ...versionsToSelect])
|
||||||
|
|
||||||
await downloadVersions(versionsToSelect, newConfig)
|
await downloadVersions(versionsToSelect)
|
||||||
})()
|
})()
|
||||||
}, [serverVersionList, downloadedVersionsConfig, downloadVersions])
|
}, [serverVersionList, downloadedVersionsConfig, downloadVersions])
|
||||||
|
|
||||||
@@ -862,10 +869,7 @@ export default function RootLayout ({
|
|||||||
setFadeOut(true)
|
setFadeOut(true)
|
||||||
setTimeout(() => setShowPopup(false), 200)
|
setTimeout(() => setShowPopup(false), 200)
|
||||||
if (downloadedVersionsConfig)
|
if (downloadedVersionsConfig)
|
||||||
downloadVersions(
|
downloadVersions(selectedVersionList)
|
||||||
selectedVersionList,
|
|
||||||
downloadedVersionsConfig
|
|
||||||
)
|
|
||||||
}}
|
}}
|
||||||
disabled={downloadProgress.length != 0}
|
disabled={downloadProgress.length != 0}
|
||||||
title={
|
title={
|
||||||
|
|||||||
Reference in New Issue
Block a user