aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--render/gles2/renderer.c4
-rw-r--r--types/wlr_layer_shell.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index 8f3ce7f7..c8094847 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -322,11 +322,11 @@ static log_importance_t gles2_log_importance_to_wlr(GLenum type) {
case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR: return L_ERROR;
case GL_DEBUG_TYPE_PORTABILITY_KHR: return L_DEBUG;
case GL_DEBUG_TYPE_PERFORMANCE_KHR: return L_DEBUG;
- case GL_DEBUG_TYPE_OTHER_KHR: return L_INFO;
+ case GL_DEBUG_TYPE_OTHER_KHR: return L_DEBUG;
case GL_DEBUG_TYPE_MARKER_KHR: return L_DEBUG;
case GL_DEBUG_TYPE_PUSH_GROUP_KHR: return L_DEBUG;
case GL_DEBUG_TYPE_POP_GROUP_KHR: return L_DEBUG;
- default: return L_INFO;
+ default: return L_DEBUG;
}
}
diff --git a/types/wlr_layer_shell.c b/types/wlr_layer_shell.c
index cbf21f4a..b81fb4c6 100644
--- a/types/wlr_layer_shell.c
+++ b/types/wlr_layer_shell.c
@@ -353,10 +353,13 @@ static const struct zwlr_layer_shell_v1_interface layer_shell_implementation = {
};
static void client_handle_destroy(struct wl_resource *resource) {
+ struct wl_client *client = wl_resource_get_client(resource);
struct wlr_layer_shell *shell = layer_shell_from_resource(resource);
struct wlr_layer_surface *surface, *tmp = NULL;
wl_list_for_each_safe(surface, tmp, &shell->surfaces, link) {
- layer_surface_destroy(surface);
+ if (wl_resource_get_client(surface->resource) == client) {
+ layer_surface_destroy(surface);
+ }
}
wl_list_remove(wl_resource_get_link(resource));
}