From 7aefba60df7ff5433d09fa2e714e893b834084c8 Mon Sep 17 00:00:00 2001 From: Konkitoman Date: Tue, 22 Aug 2023 11:20:34 +0300 Subject: [PATCH] Fix windows and android errors --- crates/eframe/src/native/run.rs | 4 ++-- crates/egui-winit/src/lib.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs index e42b3793c..32e995fd8 100644 --- a/crates/eframe/src/native/run.rs +++ b/crates/eframe/src/native/run.rs @@ -1858,8 +1858,8 @@ mod wgpu_integration { #[cfg(target_os = "android")] fn drop_window(&mut self) -> std::result::Result<(), egui_wgpu::WgpuError> { if let Some(running) = &mut self.running { - running.windows.remove(&0); - pollster::block_on(running.painter.set_window(None))?; + running.windows.write().remove(&ViewportId::MAIN); + pollster::block_on(running.painter.write().set_window(ViewportId::MAIN, None))?; } Ok(()) } diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs index 6016e22a3..e02143990 100644 --- a/crates/egui-winit/src/lib.rs +++ b/crates/egui-winit/src/lib.rs @@ -1124,7 +1124,7 @@ pub fn create_winit_window_builder(builder: &ViewportBuilder) -> winit::window:: } #[cfg(target_os = "windows")] - if let Some(drag_and_drop) = builder.drag_and_drop { + if let Some(enable) = builder.drag_and_drop { use winit::platform::windows::WindowBuilderExtWindows as _; window_builder = window_builder.with_drag_and_drop(enable); }