screencopy: properly handle stream resume on all frame statuses

fixes #162
hyprwm · Jan 5, 2024 · 536e6ed · 536e6ed
1 parent 1c80212
commit 536e6ed
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/portals/Screencopy.cpp b/src/portals/Screencopy.cpp
@@ -751,6 +751,15 @@ static void pwStreamStateChange(void* data, pw_stream_state old, pw_stream_state
             PSTREAM->streamState = true;
             if (PSTREAM->pSession->sharingData.status == FRAME_NONE)
                 g_pPortalManager->m_sPortals.screencopy->startFrameCopy(PSTREAM->pSession);
+            else {
+                if (PSTREAM->pSession->sharingData.frameCallback)
+                    zwlr_screencopy_frame_v1_destroy(PSTREAM->pSession->sharingData.frameCallback);
+                if (PSTREAM->pSession->sharingData.windowFrameCallback)
+                    hyprland_toplevel_export_frame_v1_destroy(PSTREAM->pSession->sharingData.windowFrameCallback);
+                PSTREAM->pSession->sharingData.windowFrameCallback = nullptr;
+                PSTREAM->pSession->sharingData.frameCallback       = nullptr;
+                g_pPortalManager->m_sPortals.screencopy->startFrameCopy(PSTREAM->pSession);
+            }
             break;
         default: PSTREAM->streamState = false; break;
     }