From b79e4a250aa836787298e5877bdfbaf408d28ac8 Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <michael@mmurphy.dev>
Date: Wed, 8 May 2024 14:54:41 +0200
Subject: [PATCH] fix(displays): inability to enable displays

---
 cosmic-settings/src/pages/display/mod.rs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cosmic-settings/src/pages/display/mod.rs b/cosmic-settings/src/pages/display/mod.rs
index 8b76419..098ad96 100644
--- a/cosmic-settings/src/pages/display/mod.rs
+++ b/cosmic-settings/src/pages/display/mod.rs
@@ -721,16 +721,15 @@ impl Page {
 
     /// Applies a display configuration via `cosmic-randr`.
     fn exec_randr(&self, output: &Output, request: Randr) -> Command<app::Message> {
-        let Some(current) = output.current.and_then(|id| self.list.modes.get(id)) else {
-            return Command::none();
-        };
-
         let name = &*output.name;
-
         let mut command = tokio::process::Command::new("cosmic-randr");
 
         match request {
             Randr::Position(x, y) => {
+                let Some(current) = output.current.and_then(|id| self.list.modes.get(id)) else {
+                    return Command::none();
+                };
+
                 command
                     .arg("mode")
                     .arg("--pos-x")
@@ -743,6 +742,10 @@ impl Page {
             }
 
             Randr::RefreshRate(rate) => {
+                let Some(current) = output.current.and_then(|id| self.list.modes.get(id)) else {
+                    return Command::none();
+                };
+
                 command
                     .arg("mode")
                     .arg("--refresh")
@@ -768,6 +771,10 @@ impl Page {
             }
 
             Randr::Scale(scale) => {
+                let Some(current) = output.current.and_then(|id| self.list.modes.get(id)) else {
+                    return Command::none();
+                };
+
                 command
                     .arg("mode")
                     .arg("--scale")
@@ -791,6 +798,10 @@ impl Page {
             }
 
             Randr::Transform(transform) => {
+                let Some(current) = output.current.and_then(|id| self.list.modes.get(id)) else {
+                    return Command::none();
+                };
+
                 command
                     .arg("mode")
                     .arg("--transform")