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

Guard against null compositor in thumbnail item

Browse source 
If compositing is disabled, compositor will be null.

We hit a path where we could destroyOffscreenTexture when the
compositing is disabled then again when the Thumbnail is destroyed. In
this case we query Compositor::self()->scene() and crash.
This commit is contained in:
David Edmundson 2021-07-01 12:38:57 +01:00
parent f53cf9d71e
commit 893f95eed8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/thumbnailitem.cpp
View file

@ -145,6 +145,9 @@ QSGTextureProvider *ThumbnailItemBase::textureProvider() const
void ThumbnailItemBase::handleCompositingToggled() void ThumbnailItemBase::handleCompositingToggled()
{ {
if (!Compositor::self()) {
return;
}
Scene *scene = Compositor::self()->scene(); Scene *scene = Compositor::self()->scene();
if (scene && scene->compositingType() == OpenGLCompositing) { if (scene && scene->compositingType() == OpenGLCompositing) {
connect(scene, &Scene::frameRendered, this, &ThumbnailItemBase::updateOffscreenTexture); connect(scene, &Scene::frameRendered, this, &ThumbnailItemBase::updateOffscreenTexture);
@ -167,6 +170,9 @@ void ThumbnailItemBase::setSourceSize(const QSize &sourceSize)
void ThumbnailItemBase::destroyOffscreenTexture() void ThumbnailItemBase::destroyOffscreenTexture()
{ {
if (!Compositor::self()) {
return;
}
Scene *scene = Compositor::self()->scene(); Scene *scene = Compositor::self()->scene();
if (!scene || scene->compositingType() != OpenGLCompositing) { if (!scene || scene->compositingType() != OpenGLCompositing) {
return; return;