Fix the last place where we were processing UI input events on the wr…

…ong thread
hrydgard · Nov 11, 2023 · d4833b7 · d4833b7
1 parent 96cfdba
commit d4833b7
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
@@ -580,7 +580,7 @@ bool EmuScreen::UnsyncTouch(const TouchInput &touch) {
 	}
 
 	if (root_) {
-		root_->Touch(touch);
+		UIScreen::UnsyncTouch(touch);
 	}
 	return true;
 }
@@ -870,6 +870,11 @@ bool EmuScreen::key(const KeyInput &key) {
 
 void EmuScreen::UnsyncAxis(const AxisInput *axes, size_t count) {
 	System_Notify(SystemNotification::ACTIVITY);
+
+	if (UI::IsFocusMovementEnabled()) {
+		return UIScreen::UnsyncAxis(axes, count);
+	}
+
 	return controlMapper_.Axis(axes, count);
 }