Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-04-20 06:17:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14425 from JosJuice/android-wiimote-crash

Browse Source 
Android: Fix Wii Remote connection crashes
This commit is contained in:
JMC47 2026-02-28 16:16:20 -05:00 committed by GitHub
commit 63fc9d7ca3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/HW/WiimoteReal/IOAndroid.cpp
View File

@ -58,11 +58,28 @@ auto WiimoteScannerAndroid::FindAttachedWiimotes() -> FindResults
WiimoteAndroid::WiimoteAndroid(int index) : Wiimote(), m_mayflash_index(index)
{
auto* const env = IDCache::GetEnvForThread();
jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "wiimotePayload", "[[B");
jobjectArray payload_object =
reinterpret_cast<jobjectArray>(env->GetStaticObjectField(s_adapter_class, payload_field));
jobject java_wiimote_payload = env->GetObjectArrayElement(payload_object, m_mayflash_index);
m_java_wiimote_payload = reinterpret_cast<jbyteArray>(env->NewGlobalRef(java_wiimote_payload));
env->DeleteLocalRef(payload_object);
env->DeleteLocalRef(java_wiimote_payload);
// Get function pointers
m_input_func = env->GetStaticMethodID(s_adapter_class, "input", "(I)I");
m_output_func = env->GetStaticMethodID(s_adapter_class, "output", "(I[BI)I");
}
WiimoteAndroid::~WiimoteAndroid()
{
Shutdown();
auto* const env = IDCache::GetEnvForThread();
env->DeleteGlobalRef(m_java_wiimote_payload);
}
std::string WiimoteAndroid::GetId() const
@ -81,17 +98,6 @@ bool WiimoteAndroid::ConnectInternal()
if (IsConnected())
return true;
auto* const env = IDCache::GetEnvForThread();
jfieldID payload_field = env->GetStaticFieldID(s_adapter_class, "wiimotePayload", "[[B");
jobjectArray payload_object =
reinterpret_cast<jobjectArray>(env->GetStaticObjectField(s_adapter_class, payload_field));
m_java_wiimote_payload = (jbyteArray)env->GetObjectArrayElement(payload_object, m_mayflash_index);
// Get function pointers
m_input_func = env->GetStaticMethodID(s_adapter_class, "input", "(I)I");
m_output_func = env->GetStaticMethodID(s_adapter_class, "output", "(I[BI)I");
// Test a write to see if a remote is actually connected to the DolphinBar.
constexpr u8 report[] = {WR_SET_REPORT | BT_OUTPUT,
u8(WiimoteCommon::OutputReportID::RequestStatus), 0};
@ -149,5 +155,6 @@ void InitAdapterClass()
JNIEnv* env = IDCache::GetEnvForThread();
jclass adapter_class = env->FindClass("org/dolphinemu/dolphinemu/utils/WiimoteAdapter");
s_adapter_class = reinterpret_cast<jclass>(env->NewGlobalRef(adapter_class));
env->DeleteLocalRef(adapter_class);
}
} // namespace WiimoteReal