[Scummvm-git-logs] scummvm branch-2-8 -> d92d468bf25df59b8b9dfd29b2323be6d933fb6f

[lephilousophe]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d92d468bf2 ANDROID: Check if MotionEvent is set before using it


Commit: d92d468bf25df59b8b9dfd29b2323be6d933fb6f
    https://github.com/scummvm/scummvm/commit/d92d468bf25df59b8b9dfd29b2323be6d933fb6f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2023-12-10T12:35:36+01:00

Commit Message:
ANDROID: Check if MotionEvent is set before using it

e1 can be null in case of error according to documentation.
Don't trigger an event in this case.

Changed paths:
    backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java


diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
index af6bb9bc259..fdd9294a4aa 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMEventsBase.java
@@ -632,7 +632,7 @@ public class ScummVMEventsBase implements
 									float distanceX, float distanceY) {
 		_handler.removeMessages(MSG_LONG_TOUCH_EVENT);
 //		Log.d(ScummVM.LOG_TAG, "onScroll");
-		if (_touchMode != TOUCH_MODE_GAMEPAD) {
+		if (_touchMode != TOUCH_MODE_GAMEPAD && e1 != null) {
 			// typical use:
 			// - move mouse cursor around (most traditional point and click games)
 			// - mouse look (eg. Myst 3)