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

[server] Don't discard callbacks on surface commit

Browse source 
Old callbacks need to be kept around, otherwise mesa might freeze.
This commit is contained in:
Martin Gräßlin 2015-06-03 21:16:53 +02:00
parent 75915984bb
commit 19c03da560
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wayland/surface_interface.cpp
View file

@ -174,9 +174,6 @@ void SurfaceInterface::Private::destroy()
void SurfaceInterface::Private::commit()
{
Q_Q(SurfaceInterface);
for (wl_resource *c : current.callbacks) {
wl_resource_destroy(c);
}
const bool bufferChanged = pending.bufferIsSet;
const bool opaqueRegionChanged = pending.opaqueIsSet;
const bool inputRegionChanged = pending.inputIsSet;
@ -199,9 +196,12 @@ void SurfaceInterface::Private::commit()
}
buffer = pending.buffer;
}
QList<wl_resource*> callbacks = current.callbacks;
callbacks.append(pending.callbacks);
// copy values
current = pending;
current.buffer = buffer;
current.callbacks = callbacks;
pending = State{};
pending.children = current.children;
pending.input = current.input;