tearing: cleanup vars and avoid rendering before drm is ready

1 files changed, 8 insertions, 3 deletions

diff --git a/src/helpers/SubsurfaceTree.cpp b/src/helpers/SubsurfaceTree.cpp
index 0efa4c49..76a392e8 100644
--- a/src/helpers/SubsurfaceTree.cpp
+++ b/src/helpers/SubsurfaceTree.cpp
@@ -249,14 +249,19 @@ void Events::listener_commitSubsurface(void* owner, void* data) {
     if (pNode->pWindowOwner) {
         // tearing: if solitary, redraw it. This still might be a single surface window
         const auto PMONITOR = g_pCompositor->getMonitorFromID(pNode->pWindowOwner->m_iMonitorID);
-        if (PMONITOR->solitaryClient == pNode->pWindowOwner && pNode->pWindowOwner->canBeTorn() && PMONITOR->canTear) {
+        if (PMONITOR->solitaryClient == pNode->pWindowOwner && pNode->pWindowOwner->canBeTorn() && PMONITOR->tearingState.canTear) {
 
             CRegion damageBox;
             wlr_surface_get_effective_damage(pNode->pSurface->wlr(), damageBox.pixman());
 
             if (!damageBox.empty()) {
-                PMONITOR->nextRenderTorn = true;
-                g_pHyprRenderer->renderMonitor(PMONITOR);
+
+                if (PMONITOR->tearingState.busy) {
+                    PMONITOR->tearingState.frameScheduledWhileBusy = true;
+                } else {
+                    PMONITOR->tearingState.nextRenderTorn = true;
+                    g_pHyprRenderer->renderMonitor(PMONITOR);
+                }
             }
         }
     }