Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix: permanent PTT mute on Linux Wayland evdev backend (#1078)

yidob80d41a7bfee
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<KeybindRegistration, 'keycode' | 'keyName'>,
event: Pick<NativeInputEvent, 'keycode' | 'keyName'>,
): 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;
}