From b80d41a7bfeeb0d9532857210661b6eba02f6fe2 Mon Sep 17 00:00:00 2001 From: yido Date: Tue, 23 Jun 2026 20:34:01 +0300 Subject: [PATCH] fix: permanent PTT mute on Linux Wayland evdev backend (#1078) Co-authored-by: Jiralite <33201955+Jiralite@users.noreply.github.com> --- fluxer_app/src/features/app/keybindings/KeybindManager.ts | 4 +++- fluxer_desktop/src/main/GlobalKeyHook.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fluxer_app/src/features/app/keybindings/KeybindManager.ts b/fluxer_app/src/features/app/keybindings/KeybindManager.ts index d12b380b1..604f6f0ac 100644 --- a/fluxer_app/src/features/app/keybindings/KeybindManager.ts +++ b/fluxer_app/src/features/app/keybindings/KeybindManager.ts @@ -1337,7 +1337,9 @@ class KeybindManager { event.backend === 'evdev' || (event.backend === 'native' && isNativeMacOS()) ? (binding.physicalKeyName ?? binding.keyName) : binding.keyName; - if (expectedName !== null) return event.keyName === expectedName; + if (expectedName !== null && event.keyName === expectedName) { + return true; + } return binding.keycode !== null && event.keycode === binding.keycode; } diff --git a/fluxer_desktop/src/main/GlobalKeyHook.ts b/fluxer_desktop/src/main/GlobalKeyHook.ts index 5f09604e4..0db48e239 100644 --- a/fluxer_desktop/src/main/GlobalKeyHook.ts +++ b/fluxer_desktop/src/main/GlobalKeyHook.ts @@ -209,8 +209,8 @@ function keyEventMatchesRegistration( keybind: Pick, event: Pick, ): boolean { - if (keybind.keyName !== null) { - return keybind.keyName === event.keyName; + if (keybind.keyName !== null && event.keyName !== null && keybind.keyName === event.keyName) { + return true; } return keybind.keycode !== 0 && keybind.keycode === event.keycode; }