github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix linter error and make identifier check more explicit

Browse Source
This commit is contained in:
Patrick Pacher
2022-07-19 15:58:08 +02:00
parent 71bedc6361
commit f4030d579b
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
cmds/portmaster-start/run.go
View File

@@ -122,17 +122,18 @@ func getExecArgs(opts *Options, cmdArgs []string) []string {
args = append(args, "--input-signals") args = append(args, "--input-signals")
} }
// see https://www.freedesktop.org/software/systemd/man/pam_systemd.html#type= if opts.Identifier == "app/portmaster-app.zip" {
if xdgSessionType := os.Getenv("XDG_SESSION_TYPE"); xdgSessionType == "wayland" && opts.Identifier == "app/portmaster-app.zip" { // see https://www.freedesktop.org/software/systemd/man/pam_systemd.html#type=
// we're running the Portmaster UI App under Wayland so make sure we add some arguments if xdgSessionType := os.Getenv("XDG_SESSION_TYPE"); xdgSessionType == "wayland" {
// required by Electron // we're running the Portmaster UI App under Wayland so make sure we add some arguments
args = append(args, // required by Electron
[]string{ args = append(args,
"--enable-features=UseOzonePlatform", []string{
"--ozone-platform=wayland", "--enable-features=UseOzonePlatform",
}..., "--ozone-platform=wayland",
) }...,
)
}
} }
args = append(args, cmdArgs...) args = append(args, cmdArgs...)