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

Android: Don't let RetroAchievements override onPause

Source/Core/Core/Core.cpp

@@ -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

Source/Core/Core/Core.h

@@ -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();