ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13829 from JosJuice/android-retroachievements-pause-override 

Android: Don't let RetroAchievements override onPause
This commit is contained in:
Admiral H. Curtiss 2025-08-01 21:23:28 +02:00 committed by GitHub
parent 6b82389f45 c3be049571
commit 5439a345a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
View File

@ -362,7 +362,7 @@ public final class NativeLibrary
/**
* Pauses emulation.
*/
public static native void PauseEmulation();
public static native void PauseEmulation(boolean overrideAchievementRestrictions);
/**
* Stops emulation.

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
View File

@ -455,7 +455,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
MENU_ACTION_REFRESH_WIIMOTES -> NativeLibrary.RefreshWiimotes()
MENU_ACTION_PAUSE_EMULATION -> {
hasUserPausedEmulation = true
NativeLibrary.PauseEmulation()
NativeLibrary.PauseEmulation(false)
}
MENU_ACTION_UNPAUSE_EMULATION -> {

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.kt
View File

@ -109,7 +109,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
override fun onPause() {
if (NativeLibrary.IsRunningAndUnpaused() && !NativeLibrary.IsShowingAlertMessage()) {
Log.debug("[EmulationFragment] Pausing emulation.")
NativeLibrary.PauseEmulation()
NativeLibrary.PauseEmulation(true)
}
super.onPause()
}

6
Source/Android/jni/MainAndroid.cpp
View File

@ -271,10 +271,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_UnPauseEmula
Core::SetState(Core::System::GetInstance(), Core::State::Running);
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(JNIEnv*, jclass)
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_PauseEmulation(
JNIEnv*, jclass, bool override_achievement_restrictions)
{
HostThreadLock guard;
Core::SetState(Core::System::GetInstance(), Core::State::Paused);
Core::SetState(Core::System::GetInstance(), Core::State::Paused, true,
override_achievement_restrictions);
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_StopEmulation(JNIEnv*, jclass)

4
Source/Core/Core/Core.cpp
View File

@ -672,7 +672,7 @@ static void EmuThread(Core::System& system, std::unique_ptr<BootParameters> boot
// Set or get the running state
void SetState(Core::System& system, State state, bool report_state_change,
bool initial_execution_state)
bool override_achievement_restrictions)
{
// State cannot be controlled until the CPU Thread is operational
if (s_state.load() != State::Running)
@ -682,7 +682,7 @@ void SetState(Core::System& system, State state, bool report_state_change,
{
case State::Paused:
#ifdef USE_RETRO_ACHIEVEMENTS
if (!initial_execution_state && !AchievementManager::GetInstance().CanPause())
if (!override_achievement_restrictions && !AchievementManager::GetInstance().CanPause())
return;
#endif // USE_RETRO_ACHIEVEMENTS
// NOTE: GetState() will return State::Paused immediately, even before anything has

2
Source/Core/Core/Core.h
View File

@ -146,7 +146,7 @@ bool WantsDeterminism();
// [NOT THREADSAFE] For use by Host only
void SetState(Core::System& system, State state, bool report_state_change = true,
bool initial_execution_state = false);
bool override_achievement_restrictions = false);
State GetState(Core::System& system);
void SaveScreenShot();