From a6ccd36147109d5cb2981122595f06ae93999b55 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Wed, 7 Feb 2024 23:47:14 +0000 Subject: [PATCH] screencopy: move monitor verif check to the proper place oops --- src/protocols/Screencopy.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index 5f8c00d4..e9ba45dd 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -191,13 +191,6 @@ void CScreencopyProtocolManager::captureOutput(wl_client* client, wl_resource* r PFRAME->resource = wl_resource_create(client, &zwlr_screencopy_frame_v1_interface, wl_resource_get_version(resource), frame); PFRAME->pMonitor = g_pCompositor->getMonitorFromOutput(wlr_output_from_resource(output)); - if (!g_pCompositor->monitorExists(PFRAME->pMonitor)) { - Debug::log(ERR, "client requested sharing of a monitor that is gone"); - zwlr_screencopy_frame_v1_send_failed(PFRAME->resource); - removeFrame(PFRAME); - return; - } - if (!PFRAME->pMonitor) { Debug::log(ERR, "client requested sharing of a monitor that doesnt exist"); zwlr_screencopy_frame_v1_send_failed(PFRAME->resource); @@ -270,6 +263,13 @@ void CScreencopyProtocolManager::copyFrame(wl_client* client, wl_resource* resou return; } + if (!g_pCompositor->monitorExists(PFRAME->pMonitor)) { + Debug::log(ERR, "client requested sharing of a monitor that is gone"); + zwlr_screencopy_frame_v1_send_failed(PFRAME->resource); + removeFrame(PFRAME); + return; + } + const auto PBUFFER = wlr_buffer_try_from_resource(buffer); if (!PBUFFER) { Debug::log(ERR, "[sc] invalid buffer in {:x}", (uintptr_t)PFRAME);