Fix win?

jpochyla · Sep 1, 2024 · e0536e9 · e0536e9
1 parent 1631d97
commit e0536e9
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/psst-gui/src/controller/playback.rs b/psst-gui/src/controller/playback.rs
@@ -128,12 +128,14 @@ impl PlaybackController {
         let hwnd = {
             #[cfg(target_os = "windows")]
             {
-                use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
-                let handle = match window.raw_window_handle() {
-                    RawWindowHandle::Win32(h) => h,
-                    _ => unreachable!(),
-                };
-                Some(handle.hwnd)
+                use raw_window_handle::{HasWindowHandle, RawWindowHandle};
+                let handle = window
+                    .window_handle()
+                    .map_err(|_| souvlaki::Error::Other("Failed to get window handle".into()))?;
+                match handle.as_raw() {
+                    RawWindowHandle::Win32(h) => Some(h.hwnd.get() as *mut std::ffi::c_void),
+                    _ => None,
+                }
             }
             #[cfg(not(target_os = "windows"))]
             None