Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
19c03da5
Commit
19c03da5
authored
Jun 03, 2015
by
Martin Flöser
Browse files
[server] Don't discard callbacks on surface commit
Old callbacks need to be kept around, otherwise mesa might freeze.
parent
75915984
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/wayland/surface_interface.cpp
View file @
19c03da5
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment