diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index be07052534..97d3be7e16 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -682,6 +682,14 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_sendInputBox(JNIEnv *en std::string seqID = GetJavaString(env, jseqID); std::string value = GetJavaString(env, jvalue); + static std::string lastSeqID = ""; + if (lastSeqID == seqID) { + // We send this on dismiss, so twice in many cases. + DLOG("Ignoring duplicate sendInputBox"); + return; + } + lastSeqID = seqID; + int seq = 0; if (!TryParse(seqID, &seq)) { ELOG("Invalid inputbox seqID value: %s", seqID.c_str()); diff --git a/android/src/org/ppsspp/ppsspp/NativeActivity.java b/android/src/org/ppsspp/ppsspp/NativeActivity.java index 58f6dc21da..7628b91fbf 100644 --- a/android/src/org/ppsspp/ppsspp/NativeActivity.java +++ b/android/src/org/ppsspp/ppsspp/NativeActivity.java @@ -1213,6 +1213,12 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C d.cancel(); } }) + .setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface d) { + NativeApp.sendInputBox(seqID, false, ""); + } + }) .create(); dlg.setCancelable(true);