elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-27 21:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't end frame normally when panicking

Browse Source 
igEndFrame might end up doing an assert that aborts the process, which
prevents the panic handler from doing its job.
This commit is contained in:
Joonas Javanainen 2019-04-21 00:06:16 +03:00
parent 3e9c14a2a0
commit 8fc605ed84
No known key found for this signature in database
GPG Key ID: D39CCA5CB19B9179
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib.rs
View File

@ -6,6 +6,7 @@ use std::os::raw::{c_char, c_float, c_int, c_uchar, c_void};
use std::ptr; use std::ptr;
use std::slice; use std::slice;
use std::str; use std::str;
use std::thread;
use sys::ImGuiStyleVar; use sys::ImGuiStyleVar;
pub use self::child_frame::ChildFrame; pub use self::child_frame::ChildFrame;
@ -588,7 +589,7 @@ impl<'ui> Ui<'ui> {
impl<'a> Drop for Ui<'a> { impl<'a> Drop for Ui<'a> {
fn drop(&mut self) { fn drop(&mut self) {
if self.needs_cleanup { if self.needs_cleanup && !thread::panicking() {
unsafe { unsafe {
sys::igEndFrame(); sys::igEndFrame();
CURRENT_UI = None; CURRENT_UI = None;