mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-15 08:22:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

screencopy: simplify capture error handling

Browse source 
Signed-off-by: liupeng <liupeng01@kylinos.cn>
This commit is contained in:
liupeng 2026-03-04 09:45:15 +08:00
parent 55bb69e2c4
commit 1b8c3ea8c5
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types/wlr_screencopy_v1.c
View file

@ -505,7 +505,7 @@ static void capture_output(struct wl_client *wl_client,
wl_resource_set_implementation(frame->resource, &frame_impl, frame, wl_resource_set_implementation(frame->resource, &frame_impl, frame,
frame_handle_resource_destroy); frame_handle_resource_destroy);
if (output == NULL) { if (output == NULL || !output->enabled) {
wl_resource_set_user_data(frame->resource, NULL); wl_resource_set_user_data(frame->resource, NULL);
zwlr_screencopy_frame_v1_send_failed(frame->resource); zwlr_screencopy_frame_v1_send_failed(frame->resource);
free(frame); free(frame);
@ -522,10 +522,6 @@ static void capture_output(struct wl_client *wl_client,
wl_signal_add(&output->events.destroy, &frame->output_destroy); wl_signal_add(&output->events.destroy, &frame->output_destroy);
frame->output_destroy.notify = frame_handle_output_destroy; frame->output_destroy.notify = frame_handle_output_destroy;
if (output == NULL || !output->enabled) {
goto error;
}
struct wlr_renderer *renderer = output->renderer; struct wlr_renderer *renderer = output->renderer;
assert(renderer); assert(renderer);