Merge pull request #9415 from Filoppi/patch-8

Fix cursor going to +infinite if the window size was 0

1 files changed, 2 insertions, 2 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
index dac0c085fa..a60edc3282 100644
--- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp
@@ -227,8 +227,8 @@ void KeyboardMouse::UpdateCursor()
   const auto window_scale = g_controller_interface.GetWindowInputScale();
 
   // the mouse position as a range from -1 to 1
-  m_state.cursor.x = (win_x / win_attribs.width * 2 - 1) * window_scale.x;
-  m_state.cursor.y = (win_y / win_attribs.height * 2 - 1) * window_scale.y;
+  m_state.cursor.x = (win_x / std::max(win_attribs.width, 1) * 2 - 1) * window_scale.x;
+  m_state.cursor.y = (win_y / std::max(win_attribs.height, 1) * 2 - 1) * window_scale.y;
 }
 
 void KeyboardMouse::UpdateInput()