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

input: prevent seat touch methods from being called when there's no touch

Browse source 
Otherwise we get a crash as we are asserting with Q_ASSERT(d->touch).
This commit is contained in:
Aleix Pol 2021-03-11 01:34:03 +01:00 committed by Aleix Pol Gonzalez
parent 58debd72a3
commit 9786ea3c58
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/touch_input.cpp
View file

@ -195,13 +195,15 @@ void TouchInputRedirection::cancel()
// up events will be silently ignored and won't be passed down through the event filter chain. // up events will be silently ignored and won't be passed down through the event filter chain.
// If the touch sequence is cancelled because we received a TOUCH_CANCEL event from libinput, // If the touch sequence is cancelled because we received a TOUCH_CANCEL event from libinput,
// the compositor will not receive any TOUCH_MOTION or TOUCH_UP events for that slot. // the compositor will not receive any TOUCH_MOTION or TOUCH_UP events for that slot.
m_activeTouchPoints.clear(); if (!m_activeTouchPoints.isEmpty()) {
waylandServer()->seat()->cancelTouchSequence(); m_activeTouchPoints.clear();
waylandServer()->seat()->cancelTouchSequence();
}
} }
void TouchInputRedirection::frame() void TouchInputRedirection::frame()
{ {
if (!inited()) { if (!inited() || !waylandServer()->seat()->hasTouch()) {
return; return;
} }
waylandServer()->seat()->touchFrame(); waylandServer()->seat()->touchFrame();