waveterm/wails
0
0
Fork 0
mirror of https://github.com/wavetermdev/wails.git synced 2026-08-05 13:53:43 -07:00
Code Issues Packages Projects Releases Wiki Activity

v2 [#3133] SingleInstanceData: Fill missing WD as is (#3154)

Browse Source 
* [#3133] SingleInstanceData: Fill missing WD as is

* Apply suggestions from code review

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Fix: missing `import` for AI suggestions

* Add changelog entry

---------

Co-authored-by: Lea Anthony <lea.anthony@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
Vladimir
2024-01-04 05:26:24 +11:00
committed by GitHub
co-authored by Lea Anthony coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
parent f1265c527e
commit f7c19469a7
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2/internal/frontend/desktop/linux/single_instance.go
+8
View File
@@ -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
}
v2/internal/frontend/desktop/windows/single_instance.go
+11 -1
View File
@@ -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
website/src/pages/changelog.mdx
+1
View File
@@ -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