Merge 712916a450 into f2dc48d92f

src/helpers/Watchdog.cpp

@@ -7,9 +7,7 @@ CWatchdog::~CWatchdog() {
     m_bExitThread = true;
     m_bNotified   = true;
     m_cvWatchdogCondition.notify_all();
-
-    if (m_pWatchdog && m_pWatchdog->joinable())
-        m_pWatchdog->join();
+    m_pWatchdog.reset();
 }
 
 CWatchdog::CWatchdog() {
@@ -35,6 +33,8 @@ CWatchdog::CWatchdog() {
             m_bNotified = false;
         }
     });
+
+    m_pWatchdog->detach();
 }
 
 void CWatchdog::startWatching() {

src/render/Renderbuffer.cpp

@@ -6,7 +6,7 @@
 #include <dlfcn.h>
 
 CRenderbuffer::~CRenderbuffer() {
-    if (!g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
+    if (!g_pCompositor)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();

src/render/Texture.cpp

@@ -9,7 +9,7 @@ CTexture::CTexture() {
 }
 
 CTexture::~CTexture() {
-    if (m_bNonOwning || !g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
+    if (m_bNonOwning)
         return;
 
     g_pHyprRenderer->makeEGLCurrent();