From 9418499958bda1cf20b2a1133d2fe613ef718a36 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Mon, 13 Nov 2023 19:07:55 +0100 Subject: [PATCH] Avoid unwrap --- crates/eframe/src/native/run.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index f6a256a8f..a34e47856 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -1633,19 +1633,14 @@ mod glow_integration { Ok(match event { winit::event::Event::Resumed => { - if self.running.is_none() { + if let Some(running) = &mut self.running { + // not the first resume event. create whatever you need. + running.glutin_ctx.borrow_mut().on_resume(event_loop)?; + } else { // first resume event. // we can actually move this outside of event loop. // and just run the on_resume fn of gl_window self.init_run_state(event_loop)?; - } else { - // not the first resume event. create whatever you need. - self.running - .as_mut() - .unwrap() - .glutin_ctx - .borrow_mut() - .on_resume(event_loop)?; } EventResult::RepaintNow( self.running