From e0c7533ede56c770b317f77597990ca5ab8048e0 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 8 Sep 2022 10:50:35 +0200 Subject: [PATCH] eframe native: Make sure we only shut down once I don't trust winit to actually exit on ControlFlow::Exit Perhaps this will solve https://github.com/emilk/egui/issues/2027 --- crates/eframe/src/native/run.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index 25e3ca21..f9726970 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -407,7 +407,7 @@ mod glow_integration { } fn save_and_destroy(&mut self) { - if let Some(running) = &mut self.running { + if let Some(mut running) = self.running.take() { running .integration .save(running.app.as_mut(), running.gl_window.window()); @@ -778,7 +778,7 @@ mod wgpu_integration { } fn save_and_destroy(&mut self) { - if let Some(running) = &mut self.running { + if let Some(mut running) = self.running.take() { if let Some(window) = &self.window { running.integration.save(running.app.as_mut(), window); }