Skip to content

Commit aa9308a

Browse files
macos objc2 version update, handle type verification (Rust-SDL2#83)
1 parent d226b69 commit aa9308a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ version = "0.6.2"
3939
optional = true
4040

4141
[target.'cfg(target_os = "macos")'.dependencies.objc2]
42-
version = "0.5.2"
42+
version = "0.6.0"
4343
optional = true
4444

4545
[dev-dependencies]

src/sdl3/raw_window_handle.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,11 @@ impl HasWindowHandle for Window {
4848
sys::video::SDL_PROP_WINDOW_COCOA_WINDOW_POINTER,
4949
std::ptr::null_mut(),
5050
);
51-
let ns_view = msg_send![ns_window as *mut NSObject, contentView];
52-
let handle = AppKitWindowHandle::new(NonNull::new_unchecked(ns_view));
51+
let ns_view: *mut NSObject = msg_send![ns_window as *mut NSObject, contentView];
52+
if ns_view.is_null() {
53+
return Err(HandleError::Unavailable);
54+
}
55+
let handle = AppKitWindowHandle::new(NonNull::new_unchecked(ns_view.cast()));
5356
let raw_window_handle = RawWindowHandle::AppKit(handle);
5457

5558
Ok(WindowHandle::borrow_raw(raw_window_handle))

0 commit comments

Comments
 (0)