Fix null monitors causing panics

hyprland-community · Jan 7, 2025 · 2af977c · 2af977c
1 parent c07d326
commit 2af977c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/dispatch.rs b/src/dispatch.rs
@@ -121,7 +121,7 @@ impl std::fmt::Display for MonitorIdentifier<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let out = match self {
             MonitorIdentifier::Direction(dir) => dir.to_string(),
-            MonitorIdentifier::Id(id) => id.to_string(),
+            MonitorIdentifier::Id(id) => id.map_or("None".to_string(), |id| id.to_string()),
             MonitorIdentifier::Name(name) => name.to_string(),
             MonitorIdentifier::Current => "current".to_string(),
             MonitorIdentifier::Relative(int) => format_relative(*int, ""),

diff --git a/src/shared.rs b/src/shared.rs
@@ -158,7 +158,7 @@ pub type WorkspaceId = i32;
 
 /// This type provides the id used to identify monitors
 /// > its a type because it might change at some point
-pub type MonitorId = i128;
+pub type MonitorId = Option<i128>;
 
 #[inline]
 fn ser_spec_opt(opt: &Option<String>) -> String {