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

effect: Refuse starting quick effect if keyboard cannot be grabbed

Browse source 
If effects->grabKeyboard() fails and effects->ungrabKeyboard() is called
later, kwin will crash due to an assert in the ungrabKeyboard() function.

This matters only on X11.
This commit is contained in:
Vlad Zahorodnii 2024-08-21 21:24:18 +03:00
parent d474a6795b
commit 95611189d5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/effect/quickeffect.cpp
View file

@ -500,6 +500,12 @@ void QuickSceneEffect::startInternal()
return; return;
} }
if (!effects->grabKeyboard(this)) {
return;
}
effects->startMouseInterception(this, Qt::ArrowCursor);
effects->setActiveFullScreenEffect(this); effects->setActiveFullScreenEffect(this);
d->running = true; d->running = true;
@ -516,9 +522,6 @@ void QuickSceneEffect::startInternal()
connect(effects, &EffectsHandler::screenAdded, this, &QuickSceneEffect::handleScreenAdded); connect(effects, &EffectsHandler::screenAdded, this, &QuickSceneEffect::handleScreenAdded);
connect(effects, &EffectsHandler::screenRemoved, this, &QuickSceneEffect::handleScreenRemoved); connect(effects, &EffectsHandler::screenRemoved, this, &QuickSceneEffect::handleScreenRemoved);
effects->grabKeyboard(this);
effects->startMouseInterception(this, Qt::ArrowCursor);
} }
void QuickSceneEffect::stopInternal() void QuickSceneEffect::stopInternal()