yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xwayland: Guard against xwyayland connection closing in input spy

Browse source 
The event spy is removed when xwayland closed, but it's based on the
process not the wayland socket, so it can be temporarily out of sync.

There were no guards for the connection being null.

BUG: 471789
This commit is contained in:
David Edmundson 2023-06-30 09:19:18 +01:00
parent f09f5c608d
commit e93adbee07
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/xwayland/xwayland.cpp
View file

@ -157,8 +157,9 @@ public:
return;
}
auto client = surface->client();
if (waylandServer()->xWaylandConnection() != client) {
KWaylandServer::ClientConnection *client = surface->client();
KWaylandServer::ClientConnection *xwaylandClient = waylandServer()->xWaylandConnection();
if (xwaylandClient && xwaylandClient != client) {
KWaylandServer::KeyboardKeyState state{event->type() == QEvent::KeyPress};
if (!updateKey(event->nativeScanCode(), state)) {
return;
@ -170,7 +171,7 @@ public:
xkb->modifierState().locked,
xkb->currentLayout());
waylandServer()->seat()->keyboard()->sendKey(event->nativeScanCode(), state, waylandServer()->xWaylandConnection());
waylandServer()->seat()->keyboard()->sendKey(event->nativeScanCode(), state, xwaylandClient);
}
}