Fix closing the chat window with ESC, see #18134

hrydgard · Sep 11, 2023 · 4df4adb · 4df4adb
1 parent ec33bcf
commit 4df4adb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Common/UI/UIScreen.cpp b/Common/UI/UIScreen.cpp
@@ -91,19 +91,19 @@ bool UIScreen::UnsyncTouch(const TouchInput &touch) {
 		}
 	}
 
-	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	QueuedEvent ev{};
 	ev.type = QueuedEventType::TOUCH;
 	ev.touch = touch;
+	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	eventQueue_.push_back(ev);
 	return false;
 }
 
 void UIScreen::UnsyncAxis(const AxisInput &axis) {
-	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	QueuedEvent ev{};
 	ev.type = QueuedEventType::AXIS;
 	ev.axis = axis;
+	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	eventQueue_.push_back(ev);
 }
 
@@ -123,10 +123,10 @@ bool UIScreen::UnsyncKey(const KeyInput &key) {
 		}
 	}
 
-	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	QueuedEvent ev{};
 	ev.type = QueuedEventType::KEY;
 	ev.key = key;
+	std::lock_guard<std::mutex> guard(eventQueueLock_);
 	eventQueue_.push_back(ev);
 	return retval;
 }

diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
@@ -844,16 +844,16 @@ bool EmuScreen::UnsyncKey(const KeyInput &key) {
 	System_Notify(SystemNotification::ACTIVITY);
 
 	if (UI::IsFocusMovementEnabled()) {
-		if (UIScreen::UnsyncKey(key)) {
-			return true;
-		} else if ((key.flags & KEY_DOWN) != 0 && UI::IsEscapeKey(key)) {
+		bool retval = UIScreen::UnsyncKey(key);
+		if ((key.flags & KEY_DOWN) != 0 && UI::IsEscapeKey(key)) {
 			if (chatMenu_)
 				chatMenu_->Close();
 			if (chatButton_)
 				chatButton_->SetVisibility(UI::V_VISIBLE);
 			UI::EnableFocusMovement(false);
-			return true;
+			retval = true;
 		}
+		return retval;
 	}
 
 	return controlMapper_.Key(key, &pauseTrigger_);