twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-07 15:41:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

monitors: fix vrr breaking monitor disconnect (#8314)

Browse Source
This commit is contained in:
Ikalco
2024-11-01 07:30:26 -05:00
committed by GitHub
parent 93b4478e70
commit c4d214c42d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/config/ConfigManager.cpp
View File

@@ -1608,9 +1608,6 @@ void CConfigManager::ensureVRR(PHLMONITOR pMonitor) {
m->vrrActive = true; m->vrrActive = true;
return; return;
} else if (USEVRR == 2) { } else if (USEVRR == 2) {
/* fullscreen */
m->vrrActive = true;
const auto PWORKSPACE = m->activeWorkspace; const auto PWORKSPACE = m->activeWorkspace;
if (!PWORKSPACE) if (!PWORKSPACE)
@@ -1619,6 +1616,9 @@ void CConfigManager::ensureVRR(PHLMONITOR pMonitor) {
const auto WORKSPACEFULL = PWORKSPACE->m_bHasFullscreenWindow && (PWORKSPACE->m_efFullscreenMode & FSMODE_FULLSCREEN); const auto WORKSPACEFULL = PWORKSPACE->m_bHasFullscreenWindow && (PWORKSPACE->m_efFullscreenMode & FSMODE_FULLSCREEN);
if (WORKSPACEFULL) { if (WORKSPACEFULL) {
/* fullscreen */
m->vrrActive = true;
m->output->state->resetExplicitFences(); m->output->state->resetExplicitFences();
m->output->state->setAdaptiveSync(true); m->output->state->setAdaptiveSync(true);
@@ -1631,6 +1631,8 @@ void CConfigManager::ensureVRR(PHLMONITOR pMonitor) {
Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name); Debug::log(ERR, "Couldn't commit output {} in ensureVRR -> true", m->output->name);
} else if (!WORKSPACEFULL) { } else if (!WORKSPACEFULL) {
m->vrrActive = false;
m->output->state->resetExplicitFences(); m->output->state->resetExplicitFences();
m->output->state->setAdaptiveSync(false); m->output->state->setAdaptiveSync(false);

1
src/helpers/Monitor.cpp
View File

@@ -334,6 +334,7 @@ void CMonitor::onDisconnect(bool destroy) {
activeWorkspace.reset(); activeWorkspace.reset();
output->state->resetExplicitFences(); output->state->resetExplicitFences();
output->state->setAdaptiveSync(false);
output->state->setEnabled(false); output->state->setEnabled(false);
if (!state.commit()) if (!state.commit())