Merge pull request #9877 from JosJuice/android-early-panic
Android: Avoid crash on early panic alert
This commit is contained in:
commit
b09347c160
|
@ -175,13 +175,21 @@ void Host_TitleChanged()
|
|||
|
||||
static bool MsgAlert(const char* caption, const char* text, bool yes_no, Common::MsgType style)
|
||||
{
|
||||
// If a panic alert happens very early in the execution of a game, we can crash here with
|
||||
// the error "JNI NewString called with pending exception java.lang.StackOverflowError".
|
||||
// As a workaround, let's put the call on a new thread with a brand new stack.
|
||||
|
||||
jboolean result;
|
||||
|
||||
std::thread([&] {
|
||||
JNIEnv* env = IDCache::GetEnvForThread();
|
||||
|
||||
// Execute the Java method.
|
||||
jboolean result =
|
||||
env->CallStaticBooleanMethod(IDCache::GetNativeLibraryClass(), IDCache::GetDisplayAlertMsg(),
|
||||
ToJString(env, caption), ToJString(env, text), yes_no,
|
||||
style == Common::MsgType::Warning, s_need_nonblocking_alert_msg);
|
||||
result = env->CallStaticBooleanMethod(
|
||||
IDCache::GetNativeLibraryClass(), IDCache::GetDisplayAlertMsg(), ToJString(env, caption),
|
||||
ToJString(env, text), yes_no, style == Common::MsgType::Warning,
|
||||
s_need_nonblocking_alert_msg);
|
||||
}).join();
|
||||
|
||||
return result != JNI_FALSE;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue