minor changes to unsafe state handling

This commit is contained in:
vaxerski 2022-12-02 18:45:45 +00:00
parent 10d34ef818
commit a2a12018d9

View file

@ -1263,9 +1263,8 @@ void CConfigManager::loadConfigLoadVars() {
// and they'll be taken care of in the newMonitor event // and they'll be taken care of in the newMonitor event
// ignore if nomonitorreload is set // ignore if nomonitorreload is set
if (!isFirstLaunch && !m_bNoMonitorReload) { if (!isFirstLaunch && !m_bNoMonitorReload) {
m_bWantsMonitorReload = true;
// check // check
performMonitorReload();
ensureDPMS(); ensureDPMS();
ensureVRR(); ensureVRR();
} }
@ -1576,6 +1575,9 @@ void CConfigManager::performMonitorReload() {
if (overAgain) if (overAgain)
performMonitorReload(); performMonitorReload();
if (!g_pCompositor->m_vMonitors.empty()) // reset unsafe state if we have monitors
g_pCompositor->m_bUnsafeState = false;
m_bWantsMonitorReload = false; m_bWantsMonitorReload = false;
} }