diff --git a/v2/internal/frontend/desktop/linux/single_instance.go b/v2/internal/frontend/desktop/linux/single_instance.go index 9d6426e14..0317dee49 100644 --- a/v2/internal/frontend/desktop/linux/single_instance.go +++ b/v2/internal/frontend/desktop/linux/single_instance.go @@ -7,6 +7,7 @@ import ( "encoding/json" "github.com/godbus/dbus/v5" "github.com/wailsapp/wails/v2/pkg/options" + "log" "os" "strings" ) @@ -55,8 +56,15 @@ func SetupSingleInstance(uniqueID string) { data := options.SecondInstanceData{ Args: os.Args[1:], } + data.WorkingDirectory, err = os.Getwd() + if err != nil { + log.Printf("Failed to get working directory: %v", err) + return + } + serialized, err := json.Marshal(data) if err != nil { + log.Printf("Failed to marshal data: %v", err) return } diff --git a/v2/internal/frontend/desktop/windows/single_instance.go b/v2/internal/frontend/desktop/windows/single_instance.go index 222d9fe1a..a02b7edb9 100644 --- a/v2/internal/frontend/desktop/windows/single_instance.go +++ b/v2/internal/frontend/desktop/windows/single_instance.go @@ -7,6 +7,7 @@ import ( "github.com/wailsapp/wails/v2/internal/frontend/desktop/windows/winc/w32" "github.com/wailsapp/wails/v2/pkg/options" "golang.org/x/sys/windows" + "log" "os" "syscall" "unsafe" @@ -51,7 +52,16 @@ func SetupSingleInstance(uniqueId string) { data := options.SecondInstanceData{ Args: os.Args[1:], } - serialized, _ := json.Marshal(data) + data.WorkingDirectory, err = os.Getwd() + if err != nil { + log.Printf("Failed to get working directory: %v", err) + return + } + serialized, err := json.Marshal(data) + if err != nil { + log.Printf("Failed to marshal data: %v", err) + return + } SendMessage(hwnd, string(serialized)) // exit second instance of app after sending message diff --git a/website/src/pages/changelog.mdx b/website/src/pages/changelog.mdx index f22628551..8f28a93c5 100644 --- a/website/src/pages/changelog.mdx +++ b/website/src/pages/changelog.mdx @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Docs for IsZoomControlEnabled and ZoomFactor. Fixed by @leaanthony in [PR](https://github.com/wailsapp/wails/pull/3137) - Fixed `-compiler` flag for `wails build`, `wails dev` and `wails generate module`. Fixed in [PR](https://github.com/wailsapp/wails/pull/3121) by [@xtrafrancyz](https://github.com/xtrafrancyz) +- Fixed uninitialized `SecondInstanceData.WorkingDirectory` on linux and windows ([#3154](https://github.com/wailsapp/wails/pull/3154)). ## v2.7.1 - 2023-12-10