[Scummvm-git-logs] scummvm master -> 1d6dc51bb89f168a3be3524e280c6a0df620466b

[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:
1d6dc51bb8 ANDROID: Hide the keyboard before _scummvm is null


Commit: 1d6dc51bb89f168a3be3524e280c6a0df620466b
    https://github.com/scummvm/scummvm/commit/1d6dc51bb89f168a3be3524e280c6a0df620466b
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-09-01T19:14:41+02:00

Commit Message:
ANDROID: Hide the keyboard before _scummvm is null

Else there is a NPE in showScreenKeyboardWithoutTextInputField

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


diff --git a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
index c51b2208363..b50f2dd55fd 100644
--- a/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
+++ b/backends/platform/android/org/scummvm/scummvm/ScummVMActivity.java
@@ -1169,6 +1169,10 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 
 		super.onDestroy();
 
+		if (isScreenKeyboardShown()) {
+			hideScreenKeyboard();
+		}
+
 		if (_events != null) {
 			_finishing = true;
 
@@ -1193,9 +1197,6 @@ public class ScummVMActivity extends Activity implements OnKeyboardVisibilityLis
 			_scummvm = null;
 		}
 
-		if (isScreenKeyboardShown()) {
-			hideScreenKeyboard();
-		}
 		showToggleOnScreenBtnIcons(0);
 	}