hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: avoid double unlocks with no_fade_out (#257)

Browse source
This commit is contained in:
Maximilian Seidler 2024-04-09 12:14:04 +02:00 committed by GitHub
parent bc87adf9ec
commit a50db6d56d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/hyprlock.cpp
View file

@ -358,8 +358,10 @@ void CHyprlock::run() {
g_pRenderer = std::make_unique<CRenderer>(); g_pRenderer = std::make_unique<CRenderer>();
const auto CURRENTDESKTOP = getenv("XDG_CURRENT_DESKTOP"); const auto CURRENTDESKTOP = getenv("XDG_CURRENT_DESKTOP");
const auto SZCURRENTD = std::string{CURRENTDESKTOP ? CURRENTDESKTOP : ""}; const auto SZCURRENTD = std::string{CURRENTDESKTOP ? CURRENTDESKTOP : ""};
static auto* const PNOFADEOUT = (Hyprlang::INT* const*)g_pConfigManager->getValuePtr("general:no_fade_out");
const bool NOFADEOUT = **PNOFADEOUT;
Debug::log(LOG, "Running on {}", SZCURRENTD); Debug::log(LOG, "Running on {}", SZCURRENTD);
@ -452,15 +454,19 @@ void CHyprlock::run() {
m_sLoopState.event = true; // let it process once m_sLoopState.event = true; // let it process once
while (1) { while (!m_bTerminate) {
std::unique_lock lk(m_sLoopState.eventRequestMutex); std::unique_lock lk(m_sLoopState.eventRequestMutex);
if (m_sLoopState.event == false) if (m_sLoopState.event == false)
m_sLoopState.loopCV.wait_for(lk, std::chrono::milliseconds(5000), [this] { return m_sLoopState.event; }); m_sLoopState.loopCV.wait_for(lk, std::chrono::milliseconds(5000), [this] { return m_sLoopState.event; });
if (m_bTerminate || (std::chrono::system_clock::now() > m_tFadeEnds && m_bFadeStarted)) { if (!NOFADEOUT && m_bFadeStarted && std::chrono::system_clock::now() > m_tFadeEnds) {
releaseSessionLock(); releaseSessionLock();
break; break;
} }
if (m_bTerminate)
break;
std::lock_guard<std::mutex> lg(m_sLoopState.eventLoopMutex); std::lock_guard<std::mutex> lg(m_sLoopState.eventLoopMutex);
m_sLoopState.event = false; m_sLoopState.event = false;
@ -506,7 +512,7 @@ void CHyprlock::run() {
passed.clear(); passed.clear();
if (m_bTerminate || (std::chrono::system_clock::now() > m_tFadeEnds && m_bFadeStarted)) { if (!NOFADEOUT && m_bFadeStarted && std::chrono::system_clock::now() > m_tFadeEnds) {
releaseSessionLock(); releaseSessionLock();
break; break;
} }