mirror of https://github.com/hyprwm/Hyprland
Compare commits
2 Commits
bd44f3687e
...
197fabb54f
Author | SHA1 | Date |
---|---|---|
はれなよ | 197fabb54f | |
Tom Englund | ac11771348 |
|
@ -7,7 +7,9 @@ CWatchdog::~CWatchdog() {
|
||||||
m_bExitThread = true;
|
m_bExitThread = true;
|
||||||
m_bNotified = true;
|
m_bNotified = true;
|
||||||
m_cvWatchdogCondition.notify_all();
|
m_cvWatchdogCondition.notify_all();
|
||||||
m_pWatchdog.reset();
|
|
||||||
|
if (m_pWatchdog && m_pWatchdog->joinable())
|
||||||
|
m_pWatchdog->join();
|
||||||
}
|
}
|
||||||
|
|
||||||
CWatchdog::CWatchdog() {
|
CWatchdog::CWatchdog() {
|
||||||
|
@ -33,8 +35,6 @@ CWatchdog::CWatchdog() {
|
||||||
m_bNotified = false;
|
m_bNotified = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
m_pWatchdog->detach();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void CWatchdog::startWatching() {
|
void CWatchdog::startWatching() {
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
|
|
||||||
CRenderbuffer::~CRenderbuffer() {
|
CRenderbuffer::~CRenderbuffer() {
|
||||||
if (!g_pCompositor)
|
if (!g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_pHyprRenderer->makeEGLCurrent();
|
g_pHyprRenderer->makeEGLCurrent();
|
||||||
|
|
|
@ -9,7 +9,7 @@ CTexture::CTexture() {
|
||||||
}
|
}
|
||||||
|
|
||||||
CTexture::~CTexture() {
|
CTexture::~CTexture() {
|
||||||
if (m_bNonOwning)
|
if (m_bNonOwning || !g_pCompositor || g_pCompositor->m_bIsShuttingDown || !g_pHyprRenderer)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
g_pHyprRenderer->makeEGLCurrent();
|
g_pHyprRenderer->makeEGLCurrent();
|
||||||
|
|
Loading…
Reference in New Issue