From 1b8c3ea8c5f084f9844476c7a8491951c5646d47 Mon Sep 17 00:00:00 2001 From: liupeng Date: Wed, 4 Mar 2026 09:45:15 +0800 Subject: [PATCH] screencopy: simplify capture error handling Signed-off-by: liupeng --- types/wlr_screencopy_v1.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/types/wlr_screencopy_v1.c b/types/wlr_screencopy_v1.c index 58e8dc8ba..9916a604c 100644 --- a/types/wlr_screencopy_v1.c +++ b/types/wlr_screencopy_v1.c @@ -505,7 +505,7 @@ static void capture_output(struct wl_client *wl_client, wl_resource_set_implementation(frame->resource, &frame_impl, frame, frame_handle_resource_destroy); - if (output == NULL) { + if (output == NULL || !output->enabled) { wl_resource_set_user_data(frame->resource, NULL); zwlr_screencopy_frame_v1_send_failed(frame->resource); free(frame); @@ -522,10 +522,6 @@ static void capture_output(struct wl_client *wl_client, wl_signal_add(&output->events.destroy, &frame->output_destroy); frame->output_destroy.notify = frame_handle_output_destroy; - if (output == NULL || !output->enabled) { - goto error; - } - struct wlr_renderer *renderer = output->renderer; assert(renderer);