From 1bfd4a2bff5f67872b868d519fbb45b32aa72b1f Mon Sep 17 00:00:00 2001 From: Alessio Molinari Date: Sun, 12 Nov 2023 14:14:05 +0100 Subject: output-layout: fix wlroots display handling (#3718) --- src/helpers/Monitor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/helpers/Monitor.cpp') diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index 9dbd2a3e..743c938e 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -188,7 +188,7 @@ void CMonitor::onConnect(bool noRule) { g_pCompositor->scheduleFrameForMonitor(this); } -void CMonitor::onDisconnect() { +void CMonitor::onDisconnect(bool destroy) { if (renderTimer) { wl_event_source_remove(renderTimer); @@ -276,7 +276,8 @@ void CMonitor::onDisconnect() { activeWorkspace = -1; - wlr_output_layout_remove(g_pCompositor->m_sWLROutputLayout, output); + if (!destroy) + wlr_output_layout_remove(g_pCompositor->m_sWLROutputLayout, output); wlr_output_enable(output, false); @@ -298,7 +299,6 @@ void CMonitor::onDisconnect() { g_pHyprRenderer->m_pMostHzMonitor = pMonitorMostHz; } - std::erase_if(g_pCompositor->m_vMonitors, [&](std::shared_ptr& el) { return el.get() == this; }); } @@ -642,4 +642,4 @@ void CMonitor::moveTo(const Vector2D& pos) { Vector2D CMonitor::middle() { return vecPosition + vecSize / 2.f; -} \ No newline at end of file +} -- cgit v1.2.3