From 0399e64274ae5c05a7a40ad78e4d4852d9957e99 Mon Sep 17 00:00:00 2001 From: Lee Bousfield Date: Sat, 12 Apr 2025 09:38:46 -0500 Subject: [PATCH] screencopy: Handle explicit sync failure (#10050) --- src/protocols/Screencopy.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index afa61f36..d5a5f816 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -231,16 +231,17 @@ void CScreencopyFrame::copyDmabuf(std::function callback) { auto explicitOptions = g_pHyprRenderer->getExplicitSyncSettings(pMonitor->output); if (pMonitor->inTimeline && explicitOptions.explicitEnabled) { - pMonitor->inTimeline->addWaiter( - [callback]() { - LOGM(TRACE, "Copied frame via dma with explicit sync"); - callback(true); - }, - pMonitor->inTimelinePoint, 0); - } else { - LOGM(TRACE, "Copied frame via dma"); - callback(true); + if (pMonitor->inTimeline->addWaiter( + [callback, sync = pMonitor->eglSync]() { + LOGM(TRACE, "Copied frame via dma with explicit sync"); + callback(true); + }, + pMonitor->inTimelinePoint, 0)) + return; + // on explicit sync failure, fallthrough to immediate callback } + LOGM(TRACE, "Copied frame via dma"); + callback(true); } bool CScreencopyFrame::copyShm() {