screencopy: fix callback resetting (#358)

Author: vaxerski

src/portals/Screencopy.cpp

@@ -418,8 +418,8 @@ void CScreencopyPortal::SSession::initCallbacks() {
 
             if (!PSTREAM) {
                 Debug::log(TRACE, "[sc] wlrOnBufferDone: no stream");
-                sharingData.frameCallback.reset();
                 sharingData.status = FRAME_NONE;
+                sharingData.frameCallback.reset();
                 return;
             }
 
@@ -432,10 +432,10 @@ void CScreencopyPortal::SSession::initCallbacks() {
                 (PSTREAM->pwVideoInfo.size.width != sharingData.frameInfoDMA.w || PSTREAM->pwVideoInfo.size.height != sharingData.frameInfoDMA.h)) {
                 Debug::log(LOG, "[sc] Incompatible formats, renegotiate stream");
                 sharingData.status = FRAME_RENEG;
-                sharingData.frameCallback.reset();
                 g_pPortalManager->m_sPortals.screencopy->m_pPipewire->updateStreamParam(PSTREAM);
                 g_pPortalManager->m_sPortals.screencopy->queueNextShareFrame(this);
                 sharingData.status = FRAME_NONE;
+                sharingData.frameCallback.reset();
                 return;
             }
 
@@ -445,14 +445,14 @@ void CScreencopyPortal::SSession::initCallbacks() {
             }
 
             if (!PSTREAM->currentPWBuffer) {
-                sharingData.frameCallback.reset();
                 Debug::log(LOG, "[screencopy/pipewire] Out of buffers");
                 sharingData.status = FRAME_NONE;
                 if (sharingData.copyRetries++ < MAX_RETRIES) {
                     Debug::log(LOG, "[sc] Retrying screencopy ({}/{})", sharingData.copyRetries, MAX_RETRIES);
                     g_pPortalManager->m_sPortals.screencopy->m_pPipewire->updateStreamParam(PSTREAM);
                     g_pPortalManager->m_sPortals.screencopy->queueNextShareFrame(this);
                 }
+                sharingData.frameCallback.reset();
                 return;
             }
 
@@ -533,8 +533,8 @@ void CScreencopyPortal::SSession::initCallbacks() {
 
             if (!PSTREAM) {
                 Debug::log(TRACE, "[sc] hlOnBufferDone: no stream");
-                sharingData.windowFrameCallback.reset();
                 sharingData.status = FRAME_NONE;
+                sharingData.windowFrameCallback.reset();
                 return;
             }
 
@@ -547,10 +547,10 @@ void CScreencopyPortal::SSession::initCallbacks() {
                 (PSTREAM->pwVideoInfo.size.width != sharingData.frameInfoDMA.w || PSTREAM->pwVideoInfo.size.height != sharingData.frameInfoDMA.h)) {
                 Debug::log(LOG, "[sc] Incompatible formats, renegotiate stream");
                 sharingData.status = FRAME_RENEG;
-                sharingData.windowFrameCallback.reset();
                 g_pPortalManager->m_sPortals.screencopy->m_pPipewire->updateStreamParam(PSTREAM);
                 g_pPortalManager->m_sPortals.screencopy->queueNextShareFrame(this);
                 sharingData.status = FRAME_NONE;
+                sharingData.windowFrameCallback.reset();
                 return;
             }
 
@@ -560,14 +560,14 @@ void CScreencopyPortal::SSession::initCallbacks() {
             }
 
             if (!PSTREAM->currentPWBuffer) {
-                sharingData.windowFrameCallback.reset();
                 Debug::log(LOG, "[screencopy/pipewire] Out of buffers");
                 sharingData.status = FRAME_NONE;
                 if (sharingData.copyRetries++ < MAX_RETRIES) {
                     Debug::log(LOG, "[sc] Retrying screencopy ({}/{})", sharingData.copyRetries, MAX_RETRIES);
                     g_pPortalManager->m_sPortals.screencopy->m_pPipewire->updateStreamParam(PSTREAM);
                     g_pPortalManager->m_sPortals.screencopy->queueNextShareFrame(this);
                 }
+                sharingData.windowFrameCallback.reset();
                 return;
             }