Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-02 19:16:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix an auto-reported null pointer exception in NativeActivity, plus a couple of potential others.

Browse Source 
Must be rare though..
This commit is contained in:
Henrik Rydgard 2015-11-25 11:39:56 +01:00
parent ce05930811
commit a0cff13efa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -814,7 +814,7 @@ public class NativeActivity extends Activity {
toast.show();
Log.i(TAG, params);
return true;
} else if (command.equals("showKeyboard")) {
} else if (command.equals("showKeyboard") && mGLSurfaceView != null) {
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
// No idea what the point of the ApplicationWindowToken is or if it
// matters where we get it from...
@ -822,7 +822,7 @@ public class NativeActivity extends Activity {
mGLSurfaceView.getApplicationWindowToken(),
InputMethodManager.SHOW_FORCED, 0);
return true;
} else if (command.equals("hideKeyboard")) {
} else if (command.equals("hideKeyboard") && mGLSurfaceView != null) {
InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
inputMethodManager.toggleSoftInputFromWindow(
mGLSurfaceView.getApplicationWindowToken(),
@ -839,7 +839,7 @@ public class NativeActivity extends Activity {
Log.i(TAG, "Launching inputbox: " + title + " " + defString);
inputBox(title, defString, "OK");
return true;
} else if (command.equals("vibrate")) {
} else if (command.equals("vibrate") && mGLSurfaceView != null) {
int milliseconds = -1;
if (params != "") {
try {