From dc4ae6859dba8c7494a4116107b83a3a5c5252b0 Mon Sep 17 00:00:00 2001
From: mvlabat <mvlabat@gmail.com>
Date: Mon, 27 Mar 2023 23:14:19 +0300
Subject: [PATCH] Fix panic in the two_windows example

---
 examples/two_windows.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/examples/two_windows.rs b/examples/two_windows.rs
index 9bbb9c94b..a2a6fc32d 100644
--- 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| {