Skip to content

fix: dynamically check for xprop to prevent crashes on pure Wayland #424

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

Open
W-Varg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: dynamically check for xprop to prevent crashes on pure Wayland #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion unite@hardpixel.eu/window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import GObject from 'gi://GObject'
import Shell from 'gi://Shell'
import Meta from 'gi://Meta'
import GLib from 'gi://GLib'
import * as Main from 'resource:///org/gnome/shell/ui/main.js'
import * as Util from 'resource:///org/gnome/shell/misc/util.js'
import * as Handlers from './handlers.js'
Expand All @@ -19,6 +20,7 @@ const _HIDE_FLAGS = ['0x2', '0x0', '0x2', '0x0', '0x0']

const AppSystem = Shell.AppSystem.get_default()
const WinTracker = Shell.WindowTracker.get_default()
const HAS_XPROP = GLib.find_program_in_path('xprop') !== null

function isValid(win) {
return win && VALID_TYPES.includes(win.window_type)
Expand Down Expand Up @@ -98,7 +100,7 @@ const MetaWindow = GObject.registerClass(
this.signals = new Handlers.Signals()
this.settings = new Handlers.Settings()

if (this.xid && !this.clientDecorated) {
if (this.xid && !this.clientDecorated && HAS_XPROP) {
this.decorations = new ServerDecorations(this)
} else {
this.decorations = new ClientDecorations(this)
Expand Down