Fix NPE when receiving non-view-associated mouse events with absolute mouse mode enabled

This commit is contained in:
Cameron Gutman 2023-10-25 23:13:54 -05:00
parent ff5d9f72aa
commit 885b59fd52

View File

@ -1869,7 +1869,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
if (deltaX != 0 || deltaY != 0) {
if (prefConfig.absoluteMouseMode) {
conn.sendMouseMoveAsMousePosition(deltaX, deltaY, (short)view.getWidth(), (short)view.getHeight());
// NB: view may be null, but we can unconditionally use streamView because we don't need to adjust
// relative axis deltas for the position of the streamView within the parent's coordinate system.
conn.sendMouseMoveAsMousePosition(deltaX, deltaY, (short)streamView.getWidth(), (short)streamView.getHeight());
}
else {
conn.sendMouseMove(deltaX, deltaY);