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.

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

Fix: sidecar cleanup when only shell-sidecar is enabled #4254

Merged
merged 2 commits into from Jun 4, 2022

Conversation

busyboredom
Copy link
Contributor

What kind of change does this PR introduce?

  • [ x] Bugfix

Does this PR introduce a breaking change?

  • [ x] No

Checklist

  • When resolving issues, they are referenced in the PR's title (e.g fix: remove a typo, closes #___, #___)
  • A change file is added if any packages will require a version bump due to this PR per the instructions in the readme.
  • I have added a convincing reason for adding this feature, if necessary

Other information

Sidecar processes are not cleaned up properly unless shell-execute is enabled. This is problematic for apps in which only shell-sidecar is needed.

This fix calls crate::api::process::kill_children() when either shell-execute or shell-sidecar are enabled.

Signed-off-by: Charlie Wilkin <charlie@busyboredom.com>
@busyboredom busyboredom requested a review from a team June 2, 2022 00:16
@busyboredom
Copy link
Contributor Author

I didn't make an issue for this 'cause it's such a simple problem/solution, but if you need me to open an issue before this can be merged I will :)

@busyboredom busyboredom requested a review from a team as a code owner June 4, 2022 15:04
Copy link
Member

@lucasfernog lucasfernog left a comment

Choose a reason for hiding this comment

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

Nice catch, thanks!

@lucasfernog lucasfernog merged commit 6ba9127 into tauri-apps:dev Jun 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants