From 90115e55749a8af92aaa0ee6ae9f86687eb580d5 Mon Sep 17 00:00:00 2001 From: rdbtCVS <87152661+rdbtCVS@users.noreply.github.com> Date: Wed, 14 Oct 2026 18:05:30 +0100 Subject: [PATCH] Fix World Options pause and Escape behavior --- crates/horizon-client/src/game.rs | 11 +++++++++-- crates/horizon-client/src/game/lan_screen.rs | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 2b294bf99..a08466452 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -3084,7 +3084,11 @@ impl Game<'_> { && self.title.is_none() && (matches!( self.screen, - Screen::Paused | Screen::Options | Screen::Stats | Screen::Advancements + Screen::Paused + | Screen::Options + | Screen::Stats + | Screen::Advancements + | Screen::WorldOptions ) || self.book.is_some()) } fn capture(&mut self, capture: bool) { @@ -8355,7 +8359,10 @@ impl ApplicationHandler for Game<'_> { WindowEvent::KeyboardInput { event, .. } if self.remote_chat_open() => { self.remote_chat_key(&event) } - WindowEvent::KeyboardInput { event, .. } if self.screen == Screen::WorldOptions => { + WindowEvent::KeyboardInput { event, .. } + if self.screen == Screen::WorldOptions + && !matches!(event.physical_key, PhysicalKey::Code(KeyCode::Escape)) => + { self.world_options_key(&event) } WindowEvent::KeyboardInput { event, .. } if self.screen == Screen::Options => { diff --git a/crates/horizon-client/src/game/lan_screen.rs b/crates/horizon-client/src/game/lan_screen.rs index 4183596eb..8f2612472 100644 --- a/crates/horizon-client/src/game/lan_screen.rs +++ b/crates/horizon-client/src/game/lan_screen.rs @@ -304,8 +304,6 @@ impl Game<'_> { self.world_options = Some(o); self.apply_world_options(&before, &wanted); self.close_world_options(); - self.screen = Screen::Playing; - self.capture(true); return; } None => {}