diff --git a/app.go b/app.go index 13edb4d..10bc1e5 100644 --- a/app.go +++ b/app.go @@ -35,7 +35,7 @@ func (a *App) IgnoreMe( ) { } -func (a *App) GetDefaultPath() string { +func (a *App) GetDefaultPath(subfolder string) string { if runtime.GOOS == "windows" { localappdata := os.Getenv("LOCALAPPDATA") return filepath.Join(localappdata, "RLBot5") @@ -49,7 +49,7 @@ func (a *App) GetDefaultPath() string { xdgDataHome = filepath.Join(home, ".local/share") } - return filepath.Join(xdgDataHome, "RLBot5") + return filepath.Join(xdgDataHome, "RLBot5", subfolder) } func (a *App) DownloadBotpack(repo string, installPath string) (string, error) { diff --git a/frontend/src/components/AddBotpack.svelte b/frontend/src/components/AddBotpack.svelte index 7900550..8c61cd3 100644 --- a/frontend/src/components/AddBotpack.svelte +++ b/frontend/src/components/AddBotpack.svelte @@ -28,8 +28,7 @@ let customRepo = $state(""); let installPath = $state(""); async function setDefaultPath() { - const defaultPath = await App.GetDefaultPath(); - installPath = `${defaultPath}/bots`; + installPath = await App.GetDefaultPath("bots"); } setDefaultPath(); diff --git a/frontend/src/components/MatchSettings/Main.svelte b/frontend/src/components/MatchSettings/Main.svelte index 4361d5d..596ca14 100644 --- a/frontend/src/components/MatchSettings/Main.svelte +++ b/frontend/src/components/MatchSettings/Main.svelte @@ -48,7 +48,7 @@ function resetMutators() { } // the reason for default being "" and not null is that NiceSelect considers that the default -let selectedPreset: Gamemode | "" = $state(""); +let selectedPreset: Gamemode | "" = $state.raw(""); $effect(() => { if (selectedPreset !== "") { setPreset(selectedPreset); diff --git a/frontend/src/components/ProgressBar.svelte b/frontend/src/components/ProgressBar.svelte index 4882bfb..193f023 100644 --- a/frontend/src/components/ProgressBar.svelte +++ b/frontend/src/components/ProgressBar.svelte @@ -12,7 +12,7 @@ let { } = $props(); Events.On("monitor:download-progress", (event) => { - const { status, done } = event.data.at(-1); + const { status, done } = event.data; if (done) { percentComplete = 0;