summaryrefslogtreecommitdiff
path: root/src/helpers/Monitor.cpp
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-12-21 15:17:24 +0000
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-12-21 15:17:24 +0000
commite9bd2ee996c73cd86eecd244321e11c5fa5c9c0c (patch)
tree26ffa1710381ee4291b03f1ac16c75baad01b636 /src/helpers/Monitor.cpp
parent41cdfb7420be3a8473c46f28d74cdada4c0f2258 (diff)
move setActiveMonitor backup later in onDisconnect
Diffstat (limited to 'src/helpers/Monitor.cpp')
-rw-r--r--src/helpers/Monitor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp
index 999ef929..bda32d84 100644
--- a/src/helpers/Monitor.cpp
+++ b/src/helpers/Monitor.cpp
@@ -173,9 +173,6 @@ void CMonitor::onDisconnect() {
}
}
- if (g_pCompositor->m_pLastMonitor == this)
- g_pCompositor->setActiveMonitor(BACKUPMON);
-
// remove mirror
if (pMirrorOf) {
pMirrorOf->mirrors.erase(std::find_if(pMirrorOf->mirrors.begin(), pMirrorOf->mirrors.end(), [&](const auto& other) { return other == this; }));
@@ -239,6 +236,9 @@ void CMonitor::onDisconnect() {
g_pEventManager->postEvent(SHyprIPCEvent{"monitorremoved", szName});
+ if (g_pCompositor->m_pLastMonitor == this)
+ g_pCompositor->setActiveMonitor(BACKUPMON);
+
std::erase_if(g_pCompositor->m_vMonitors, [&](std::shared_ptr<CMonitor>& el) { return el.get() == this; });
}