vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #118 from Smithay/fix/shell_leak 

wayland.shell: Fix a leak of surfaces
This commit is contained in:
Victor Brekenfeld 2018-11-29 14:40:13 +01:00 committed by GitHub
parent 6d83dff0ee f80151d691
commit 96a57fcc5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/shell/xdg/xdg_handlers.rs
View File

@ -533,7 +533,6 @@ where
// the wl_surface is destroyed, this means the client is not // the wl_surface is destroyed, this means the client is not
// trying to change the role but it's a cleanup (possibly a // trying to change the role but it's a cleanup (possibly a
// disconnecting client), ignore the protocol check. // disconnecting client), ignore the protocol check.
return;
} else { } else {
data.shell_data data.shell_data
.compositor_token .compositor_token
@ -622,7 +621,6 @@ where
// the wl_surface is destroyed, this means the client is not // the wl_surface is destroyed, this means the client is not
// trying to change the role but it's a cleanup (possibly a // trying to change the role but it's a cleanup (possibly a
// disconnecting client), ignore the protocol check. // disconnecting client), ignore the protocol check.
return;
} else { } else {
data.shell_data data.shell_data
.compositor_token .compositor_token

2
src/wayland/shell/xdg/zxdgv6_handlers.rs
View File

@ -547,7 +547,6 @@ where
// the wl_surface is destroyed, this means the client is not // the wl_surface is destroyed, this means the client is not
// trying to change the role but it's a cleanup (possibly a // trying to change the role but it's a cleanup (possibly a
// disconnecting client), ignore the protocol check. // disconnecting client), ignore the protocol check.
return;
} else { } else {
data.shell_data data.shell_data
.compositor_token .compositor_token
@ -639,7 +638,6 @@ where
// the wl_surface is destroyed, this means the client is not // the wl_surface is destroyed, this means the client is not
// trying to change the role but it's a cleanup (possibly a // trying to change the role but it's a cleanup (possibly a
// disconnecting client), ignore the protocol check. // disconnecting client), ignore the protocol check.
return;
} else { } else {
data.shell_data data.shell_data
.compositor_token .compositor_token

2
vagga.yaml
View File

@ -4,7 +4,7 @@ containers:
base: base:
auto-clean: true auto-clean: true
setup: setup:
- !UbuntuRelease { codename: artful } - !UbuntuRelease { codename: cosmic }
- !UbuntuUniverse - !UbuntuUniverse
- !Install [build-essential, wget, curl, pkg-config, file, openssl, sudo, ca-certificates, libssl-dev, cmake, libudev-dev, libgbm-dev, libxkbcommon-dev, libegl1-mesa-dev, libwayland-dev, libinput-dev, libsystemd-dev, libdbus-1-dev] - !Install [build-essential, wget, curl, pkg-config, file, openssl, sudo, ca-certificates, libssl-dev, cmake, libudev-dev, libgbm-dev, libxkbcommon-dev, libegl1-mesa-dev, libwayland-dev, libinput-dev, libsystemd-dev, libdbus-1-dev]