From 1b2b443a03ad33bd97e4960dfac3f73b461b2bd3 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 29 May 2022 11:16:15 -0700
Subject: [PATCH] UI: Abandon focus movement on returning from pause.

See #15530.
---
 UI/EmuScreen.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index b2a32c45ec..385be99444 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -414,6 +414,9 @@ void EmuScreen::dialogFinished(const Screen *dialog, DialogResult result) {
 		System_SendMessage("event", "exitgame");
 		quit_ = false;
 	}
+	// Returning to the PauseScreen, unless we're stepping, means we should go back to controls.
+	if (Core_IsActive())
+		UI::EnableFocusMovement(false);
 	RecreateViews();
 }