From 294aa09c413b4e5425ca92280842823ac1d2678d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Wed, 3 Jul 2024 10:18:45 +0200
Subject: [PATCH] Clear pressed keys and last replay frame when detaching
 replay from ruleset input manager

---
 osu.Game/Rulesets/UI/RulesetInputManager.cs | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs
index 0fc39e6fcb..0bd90a6635 100644
--- a/osu.Game/Rulesets/UI/RulesetInputManager.cs
+++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs
@@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
+using osu.Framework.Input.StateChanges;
 using osu.Framework.Input.StateChanges.Events;
 using osu.Framework.Input.States;
 using osu.Game.Configuration;
@@ -108,7 +109,11 @@ namespace osu.Game.Rulesets.UI
             get => replayInputHandler;
             set
             {
-                if (replayInputHandler != null) RemoveHandler(replayInputHandler);
+                if (replayInputHandler != null)
+                {
+                    RemoveHandler(replayInputHandler);
+                    new ReplayStateReset().Apply(CurrentState, this);
+                }
 
                 replayInputHandler = value;
                 UseParentInput = replayInputHandler == null;
@@ -220,6 +225,19 @@ namespace osu.Game.Rulesets.UI
                 RealmKeyBindingStore.ClearDuplicateBindings(KeyBindings);
             }
         }
+
+        private class ReplayStateReset : IInput
+        {
+            public void Apply(InputState state, IInputStateChangeHandler handler)
+            {
+                if (!(state is RulesetInputManagerInputState<T> inputState))
+                    throw new InvalidOperationException($"{nameof(ReplayState<T>)} should only be applied to a {nameof(RulesetInputManagerInputState<T>)}");
+
+                inputState.LastReplayState = null;
+
+                handler.HandleInputStateChange(new ReplayStateChangeEvent<T>(state, this, inputState.LastReplayState?.PressedActions.ToArray() ?? [], []));
+            }
+        }
     }
 
     public class RulesetInputManagerInputState<T> : InputState