From 922c372df4b44f493e39e03f57d01a886509dca1 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Sat, 11 Nov 2023 22:01:18 +0100 Subject: [PATCH] Fix andoid compilation --- crates/eframe/src/native/run.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index 56e3ceb36..55df0fe1b 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -2022,17 +2022,12 @@ mod wgpu_integration { Ok(()) } - #[allow(unsafe_code)] #[cfg(target_os = "android")] fn drop_window(&mut self) -> std::result::Result<(), egui_wgpu::WgpuError> { if let Some(running) = &mut self.running { - running.viewports.borrow_mut().remove(&ViewportId::ROOT); - pollster::block_on( - running - .painter - .borrow_mut() - .set_window(ViewportId::ROOT, None), - )?; + let mut shared = running.shared.borrow_mut(); + shared.viewports.remove(&ViewportId::ROOT); + pollster::block_on(shared.painter.set_window(ViewportId::ROOT, None))?; } Ok(()) }