mirror of
https://github.com/eugeny/tabby
synced 2026-09-23 13:35:55 +00:00
Fix CLI crashes on Wayland due to unhandled X11 error in Glasstron (#11264)
Package-Build / Lint (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docs / build (push) Has been cancelled
Package-Build / macOS-Build (arm64, aarch64-apple-darwin) (push) Has been cancelled
Package-Build / macOS-Build (x86_64, x86_64-apple-darwin) (push) Has been cancelled
Package-Build / Linux-Build (amd64, x64, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Has been cancelled
Package-Build / Linux-Build (arm64, arm64, ubuntu-24.04-arm, aarch64-unknown-linux-gnu, aarch64-linux-gnu-) (push) Has been cancelled
Package-Build / Linux-Build (armhf, arm, ubuntu-24.04, arm-unknown-linux-gnueabihf, arm-linux-gnueabihf-) (push) Has been cancelled
Package-Build / Windows-Build (arm64, aarch64-pc-windows-msvc) (push) Has been cancelled
Package-Build / Windows-Build (x64, x86_64-pc-windows-msvc) (push) Has been cancelled
Package-Build / Lint (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docs / build (push) Has been cancelled
Package-Build / macOS-Build (arm64, aarch64-apple-darwin) (push) Has been cancelled
Package-Build / macOS-Build (x86_64, x86_64-apple-darwin) (push) Has been cancelled
Package-Build / Linux-Build (amd64, x64, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Has been cancelled
Package-Build / Linux-Build (arm64, arm64, ubuntu-24.04-arm, aarch64-unknown-linux-gnu, aarch64-linux-gnu-) (push) Has been cancelled
Package-Build / Linux-Build (armhf, arm, ubuntu-24.04, arm-unknown-linux-gnueabihf, arm-linux-gnueabihf-) (push) Has been cancelled
Package-Build / Windows-Build (arm64, aarch64-pc-windows-msvc) (push) Has been cancelled
Package-Build / Windows-Build (x64, x86_64-pc-windows-msvc) (push) Has been cancelled
Co-authored-by: clmcgrath <clmcgrath@users.noreply.github.com>
This commit is contained in:
co-authored by
clmcgrath
parent
7e94e672c7
commit
012a62d47b
@@ -0,0 +1,23 @@
|
||||
diff --git a/node_modules/glasstron/src/native/linux_x11/x11.js b/node_modules/glasstron/src/native/linux_x11/x11.js
|
||||
index e38682a..5a9f214 100644
|
||||
--- a/node_modules/glasstron/src/native/linux_x11/x11.js
|
||||
+++ b/node_modules/glasstron/src/native/linux_x11/x11.js
|
||||
@@ -58,10 +58,16 @@ class X11Connection {
|
||||
id = this.display.screen[0].root;
|
||||
|
||||
this.display.client.GetProperty(0, id, prop, 0, 0, 10000000, (err, propData) => {
|
||||
- if(err) console.error(err);
|
||||
+ if(err) {
|
||||
+ console.error(err);
|
||||
+ return reject(err);
|
||||
+ }
|
||||
|
||||
this.display.client.GetAtomName(propData.type, (err, typeName) => {
|
||||
- if(err) console.error(err);
|
||||
+ if(err) {
|
||||
+ console.error(err);
|
||||
+ return reject(err);
|
||||
+ }
|
||||
|
||||
propData.typeName = typeName;
|
||||
resolve(propData);
|
||||
Reference in New Issue
Block a user