Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 5 commits into from
Jan 3, 2024
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f6183d
[#3133] SingleInstanceData: Fill missing WD as is
Vovan-VE Dec 23, 2023
eda17f9
Apply suggestions from code review
leaanthony Jan 3, 2024
4e447a8
Merge branch 'master' into fix/3133-variant-1
leaanthony Jan 3, 2024
fb1f7ec
Fix: missing `import` for AI suggestions
Vovan-VE Jan 3, 2024
085cb63
Add changelog entry
Vovan-VE Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions v2/internal/frontend/desktop/linux/single_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,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
Comment on lines +60 to +62
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proper error handling is implemented for the os.Getwd() call. However, consider if returning early is the best approach, as it may prevent further necessary cleanup or logic that should execute regardless of this error.

}

serialized, err := json.Marshal(data)
if err != nil {
log.Printf("Failed to marshal data: %v", err)
return
}

Expand Down
11 changes: 10 additions & 1 deletion v2/internal/frontend/desktop/windows/single_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proper error handling is implemented for the os.Getwd() call. However, consider if returning early is the best approach, as it may prevent further necessary cleanup or logic that should execute regardless of this error.

}
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
Expand Down