From 5d44ea802a604edfcc822c9f2376bb3881f3e805 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Thu, 16 Mar 2023 14:03:40 +0000
Subject: [PATCH] monitors: guard output when read

---
 src/Compositor.cpp              | 3 +++
 src/config/ConfigManager.cpp    | 6 ++++++
 src/managers/KeybindManager.cpp | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 0c3e480f..d2d84f9d 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -1836,6 +1836,9 @@ CMonitor* CCompositor::getMonitorFromString(const std::string& name) {
         const auto DESCRIPTION = name.substr(5);
 
         for (auto& m : m_vMonitors) {
+            if (!m->output)
+                continue;
+
             if (m->output->description && std::string(m->output->description).find(DESCRIPTION) == 0) {
                 return m.get();
             }
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index c0f2d5c1..4cfd89b6 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -1761,6 +1761,9 @@ bool CConfigManager::shouldBlurLS(const std::string& ns) {
 
 void CConfigManager::ensureDPMS() {
     for (auto& rm : g_pCompositor->m_vRealMonitors) {
+        if (!rm->output)
+            continue;
+
         auto rule = getMonitorRuleFor(rm->szName, rm->output->description ? rm->output->description : "");
 
         if (rule.disabled == rm->m_bEnabled) {
@@ -1774,6 +1777,9 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
     static auto* const PVRR = &getConfigValuePtr("misc:vrr")->intValue;
 
     static auto        ensureVRRForDisplay = [&](CMonitor* m) -> void {
+        if (!m->output)
+            return;
+
         if (*PVRR == 0) {
             if (m->vrrActive) {
                 wlr_output_enable_adaptive_sync(m->output, 0);
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 9d652932..3b0a6678 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1661,6 +1661,9 @@ void CKeybindManager::forceRendererReload(std::string args) {
     bool overAgain = false;
 
     for (auto& m : g_pCompositor->m_vMonitors) {
+        if (!m->output)
+            continue;
+
         auto rule = g_pConfigManager->getMonitorRuleFor(m->szName, m->output->description ? m->output->description : "");
         if (!g_pHyprRenderer->applyMonitorRule(m.get(), &rule, true)) {
             overAgain = true;