fix(linux): avoid unwrapping in Window::current_monitor

closes tauri-apps/tauri#7986
tauri-apps · Oct 16, 2023 · eecd1c7 · eecd1c7
1 parent 081ba16
commit eecd1c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.changes/linux-current-monitor.md b/.changes/linux-current-monitor.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix `Window::current_monitor` sometimes panicking on Linux when the window is invisible.
diff --git a/src/platform_impl/linux/window.rs b/src/platform_impl/linux/window.rs
@@ -678,11 +678,12 @@ impl Window {
     let monitor = self
       .window
       .window()
-      .map(|window| display.monitor_at_window(&window))
-      .unwrap_or_else(|| display.primary_monitor())
-      .unwrap();
-    let handle = MonitorHandle { monitor };
-    Some(RootMonitorHandle { inner: handle })
+      .and_then(|window| display.monitor_at_window(&window))
+      .or_else(|| display.primary_monitor());
+
+    monitor.map(|monitor| RootMonitorHandle {
+      inner: MonitorHandle { monitor },
+    })
   }
 
   #[inline]