saberbud/zeal
1
0
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2026-08-29 08:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): validate XCB grab/ungrab on X11 (#1814)

Browse Source
This commit is contained in:
Oleg Shparber
2026-04-09 02:39:56 +03:00
committed by GitHub
parent b27c215a31
commit 60aab8e7b0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/ui/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
+4 -4
View File
@@ -176,7 +176,7 @@ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativ
bool failed = false;
for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) {
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
failed = !error.isNull();
failed |= !error.isNull();
}
if (failed) {
@@ -196,13 +196,13 @@ bool QxtGlobalShortcutPrivate::unregisterShortcut(quint32 nativeKey, quint32 nat
QList<xcb_void_cookie_t> xcbCookies;
for (quint32 maskMods : maskModifiers) {
xcb_ungrab_key(xcbConnection, nativeKey, QX11Info::appRootWindow(), nativeMods | maskMods);
xcbCookies << xcb_ungrab_key_checked(xcbConnection, nativeKey, QX11Info::appRootWindow(), nativeMods | maskMods);
}
bool failed = false;
for (xcb_void_cookie_t cookie : xcbCookies) {
for (xcb_void_cookie_t cookie : std::as_const(xcbCookies)) {
QScopedPointer<xcb_generic_error_t, QScopedPointerPodDeleter> error(xcb_request_check(xcbConnection, cookie));
failed = !error.isNull();
failed |= !error.isNull();
}
return !failed;