Merge pull request #20515 from hrydgard/more-misc-fixes

Additional fixes for 1.19.2

Core/ControlMapper.cpp

@@ -160,7 +160,10 @@ void ControlMapper::SetCallbacks(
 }
 
 void ControlMapper::SetPSPAxis(int device, int stick, char axis, float value) {
-	int axisId = axis == 'X' ? 0 : 1;
+	const int axisId = axis == 'X' ? 0 : 1;
+	if (stick != 0 && stick != 1) {
+		return;
+	}
 
 	float position[2];
 	position[0] = history_[stick][0];