fix: don't panic if primary monitor not discoverable. (#705)

* fix(linux): don't panic if primary monitor not discoverable. (#704) * chore: add change file.
tauri-apps · Feb 22, 2023 · 28b53f8 · 28b53f8
1 parent e9eba85
commit 28b53f8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.changes/linux-primary-monitor.md b/.changes/linux-primary-monitor.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Attempt to get primary monitor on linux will now return None rather than panicking if monitor not found.
diff --git a/src/platform_impl/linux/event_loop.rs b/src/platform_impl/linux/event_loop.rs
@@ -79,9 +79,11 @@ impl<T> EventLoopWindowTarget<T> {
 
   #[inline]
   pub fn primary_monitor(&self) -> Option<RootMonitorHandle> {
-    let monitor = self.display.primary_monitor().unwrap();
-    let handle = MonitorHandle { monitor };
-    Some(RootMonitorHandle { inner: handle })
+    let monitor = self.display.primary_monitor();
+    monitor.and_then(|monitor| {
+      let handle = MonitorHandle { monitor };
+      Some(RootMonitorHandle { inner: handle })
+    })
   }
 
   pub fn raw_display_handle(&self) -> RawDisplayHandle {