From a6e792b586e258ef7dd172bb272e99afd133d269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois?= <mockersf@gmail.com>
Date: Tue, 14 Feb 2023 01:08:00 +0100
Subject: [PATCH] create window as soon as possible

---
 crates/bevy_winit/src/lib.rs | 56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
index 29a839fec5a05..6a78f27769eb6 100644
--- a/crates/bevy_winit/src/lib.rs
+++ b/crates/bevy_winit/src/lib.rs
@@ -288,34 +288,6 @@ pub fn winit_runner(mut app: App) {
             }
         }
 
-        if winit_state.active {
-            #[cfg(not(target_arch = "wasm32"))]
-            let (commands, mut new_windows, created_window_writer, winit_windows) =
-                create_window_system_state.get_mut(&mut app.world);
-
-            #[cfg(target_arch = "wasm32")]
-            let (
-                commands,
-                mut new_windows,
-                created_window_writer,
-                winit_windows,
-                canvas_parent_resize_channel,
-            ) = create_window_system_state.get_mut(&mut app.world);
-
-            // Responsible for creating new windows
-            create_window(
-                commands,
-                event_loop,
-                new_windows.iter_mut(),
-                created_window_writer,
-                winit_windows,
-                #[cfg(target_arch = "wasm32")]
-                canvas_parent_resize_channel,
-            );
-
-            create_window_system_state.apply(&mut app.world);
-        }
-
         match event {
             event::Event::NewEvents(start) => {
                 let (winit_config, window_focused_query) = focused_window_state.get(&app.world);
@@ -671,6 +643,34 @@ pub fn winit_runner(mut app: App) {
 
             _ => (),
         }
+
+        if winit_state.active {
+            #[cfg(not(target_arch = "wasm32"))]
+            let (commands, mut new_windows, created_window_writer, winit_windows) =
+                create_window_system_state.get_mut(&mut app.world);
+
+            #[cfg(target_arch = "wasm32")]
+            let (
+                commands,
+                mut new_windows,
+                created_window_writer,
+                winit_windows,
+                canvas_parent_resize_channel,
+            ) = create_window_system_state.get_mut(&mut app.world);
+
+            // Responsible for creating new windows
+            create_window(
+                commands,
+                event_loop,
+                new_windows.iter_mut(),
+                created_window_writer,
+                winit_windows,
+                #[cfg(target_arch = "wasm32")]
+                canvas_parent_resize_channel,
+            );
+
+            create_window_system_state.apply(&mut app.world);
+        }
     };
 
     // If true, returns control from Winit back to the main Bevy loop