prevent potential panic

MaxVerevkin · Mar 18, 2024 · dea2603 · dea2603
1 parent e3718e9
commit dea2603
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 18 deletions.
diff --git a/src/dbus_server.rs b/src/dbus_server.rs
@@ -478,12 +478,9 @@ fn signal_set_property_to_outputs(ctx: PropContext<WaylandState>, value: Param)
         .iter()
         .filter(|output| output.color_changed())
     {
-        signal_change(
-            &mut ctx.conn.send,
-            &output.object_path(),
-            ctx.name,
-            value.clone(),
-        );
+        if let Some(path) = output.object_path() {
+            signal_change(&mut ctx.conn.send, &path, ctx.name, value.clone());
+        }
     }
 }
 
@@ -498,11 +495,8 @@ fn signal_updated_property_to_outputs(
         .iter()
         .filter(|output| output.color_changed())
     {
-        signal_change(
-            &mut ctx.conn.send,
-            &output.object_path(),
-            name,
-            value.clone(),
-        );
+        if let Some(path) = output.object_path() {
+            signal_change(&mut ctx.conn.send, &path, name, value.clone());
+        }
     }
 }
diff --git a/src/wayland.rs b/src/wayland.rs
@@ -107,10 +107,6 @@ impl Output {
         self.reg_name
     }
 
-    pub fn name(&self) -> &str {
-        self.name.as_ref().unwrap()
-    }
-
     pub fn color(&self) -> Color {
         self.color
     }
@@ -128,8 +124,10 @@ impl Output {
         self.color_changed = true;
     }
 
-    pub fn object_path(&self) -> String {
-        format!("/outputs/{}", self.name().replace('-', "_"))
+    pub fn object_path(&self) -> Option<String> {
+        self.name
+            .as_deref()
+            .map(|name| format!("/outputs/{}", name.replace('-', "_")))
     }
 
     fn update_displayed_color(&mut self, conn: &mut Connection<State>) -> Result<()> {