leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use objc's autoreleasepool instead of manually with NSAutoreleasePool (#1936)

Browse source 
Ensures the pools are released even if we panic
This commit is contained in:
Mads Marquart 2021-05-27 17:38:41 +02:00 • committed by GitHub
parent 657b4fd59e
commit 982ad46c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 47 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/platform_impl/macos/event_loop.rs
View file

@ -14,10 +14,9 @@ use std::{
use cocoa::{
appkit::{NSApp, NSEventType::NSApplicationDefined},
base::{id, nil, YES},
foundation::{NSAutoreleasePool, NSPoint},
foundation::NSPoint,
};
use scopeguard::defer;
use objc::rc::autoreleasepool;
use crate::{
event::Event,
@ -115,9 +114,9 @@ impl<T> EventLoop<T> {
let app: id = msg_send![APP_CLASS.0, sharedApplication];
let delegate = IdRef::new(msg_send![APP_DELEGATE_CLASS.0, new]);
let pool = NSAutoreleasePool::new(nil);
let _: () = msg_send![app, setDelegate:*delegate];
let _: () = msg_send![pool, drain];
autoreleasepool(|| {
let _: () = msg_send![app, setDelegate:*delegate];
});
delegate
};
let panic_info: Rc<PanicInfo> = Default::default();
@ -162,9 +161,7 @@ impl<T> EventLoop<T> {
self._callback = Some(Rc::clone(&callback));
unsafe {
let pool = NSAutoreleasePool::new(nil);
defer!(pool.drain());
autoreleasepool(|| unsafe {
let app = NSApp();
assert_ne!(app, nil);
@ -180,7 +177,7 @@ impl<T> EventLoop<T> {
resume_unwind(panic);
}
AppState::exit();
}
});
}
pub fn create_proxy(&self) -> Proxy<T> {