Fix panic in the two_windows example

vladbat00 · Mar 27, 2023 · dc4ae68 · dc4ae68
1 parent 12aa30e
commit dc4ae68
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/examples/two_windows.rs b/examples/two_windows.rs
@@ -69,9 +69,10 @@ fn ui_first_window_system(
     mut egui_ctx: Query<&mut EguiContext, With<PrimaryWindow>>,
 ) {
     let bevy_texture_id = egui_user_textures.add_image(images.bevy_icon.clone_weak());
+    let Ok(mut ctx) = egui_ctx.get_single_mut() else { return; };
     egui::Window::new("First Window")
         .vscroll(true)
-        .show(egui_ctx.single_mut().get_mut(), |ui| {
+        .show(ctx.get_mut(), |ui| {
             ui.horizontal(|ui| {
                 ui.label("Write something: ");
                 ui.text_edit_singleline(&mut ui_state.input);
@@ -93,12 +94,7 @@ fn ui_second_window_system(
     mut egui_ctx: Query<&mut EguiContext, Without<PrimaryWindow>>,
 ) {
     let bevy_texture_id = egui_user_textures.add_image(images.bevy_icon.clone_weak());
-    let mut ctx = match egui_ctx.get_single_mut().ok() {
-        Some(ctx) => ctx,
-        None => {
-            return;
-        }
-    };
+    let Ok(mut ctx) = egui_ctx.get_single_mut() else { return; };
     egui::Window::new("Second Window")
         .vscroll(true)
         .show(ctx.get_mut(), |ui| {