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

Fix Wayland display error for xdg-open #229096

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −6
Open

Fix Wayland display error for xdg-open #229096

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38579fc
Fix Wayland socket path and add support for multiple snap paths
Un5had0wed Sep 19, 2024
3dabef8
Merge branch 'main' into bugFix/wayland-display-error
Un5had0wed Sep 19, 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
14 changes: 8 additions & 6 deletions resources/linux/snap/electron-launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,17 +149,19 @@ if [[ -n "$XDG_RUNTIME_DIR" && -z "$DISABLE_WAYLAND" ]]; then
if [ -n "$WAYLAND_DISPLAY" ]; then
wdisplay="$WAYLAND_DISPLAY"
fi
wayland_sockpath="$XDG_RUNTIME_DIR/../$wdisplay"
wayland_snappath="$XDG_RUNTIME_DIR/$wdisplay"
wayland_sockpath="$XDG_RUNTIME_DIR/$wdisplay"
snap_paths=("$XDG_RUNTIME_DIR/snap."*/"$wdisplay")
if [ -S "$wayland_sockpath" ]; then
# if running under wayland, use it
#export WAYLAND_DEBUG=1
# shellcheck disable=SC2034
wayland_available=true
# create the compat symlink for now
if [ ! -e "$wayland_snappath" ]; then
ln -s "$wayland_sockpath" "$wayland_snappath"
fi
for wayland_snappath in "${snap_paths[@]}"; do
# create the compat symlink for now
if [ ! -e "$wayland_snappath" ]; then
ln -s "$wayland_sockpath" "$wayland_snappath"
fi
done
fi
fi

Expand Down