From cf75282078f9499e206c3097f1c88a2b829cb719 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 28 Nov 2020 01:43:15 +1000
Subject: [PATCH] Android: Add missing call to ApplyGameSettings

---
 android/app/src/cpp/android_host_interface.cpp       | 2 ++
 android/app/src/main/res/xml/general_preferences.xml | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/android/app/src/cpp/android_host_interface.cpp b/android/app/src/cpp/android_host_interface.cpp
index 61f9b3682..638f95243 100644
--- a/android/app/src/cpp/android_host_interface.cpp
+++ b/android/app/src/cpp/android_host_interface.cpp
@@ -509,6 +509,7 @@ void AndroidHostInterface::OnSystemDestroyed()
 void AndroidHostInterface::OnRunningGameChanged()
 {
   CommonHostInterface::OnRunningGameChanged();
+  ApplySettings(true);
 
   if (m_emulation_activity_object)
   {
@@ -638,6 +639,7 @@ void AndroidHostInterface::ApplySettings(bool display_osd_messages)
 {
   Settings old_settings = std::move(g_settings);
   LoadAndConvertSettings();
+  CommonHostInterface::ApplyGameSettings(display_osd_messages);
   CommonHostInterface::FixIncompatibleSettings(display_osd_messages);
 
   // Defer renderer changes, the app really doesn't like it.
diff --git a/android/app/src/main/res/xml/general_preferences.xml b/android/app/src/main/res/xml/general_preferences.xml
index 2441497f6..8dc24f92e 100644
--- a/android/app/src/main/res/xml/general_preferences.xml
+++ b/android/app/src/main/res/xml/general_preferences.xml
@@ -58,6 +58,12 @@
         app:defaultValue="false"
         app:summary="Loads patch codes from cheats/&lt;game name&gt;.cht in PCSXR format. Codes can be toggled while ingame."
         app:iconSpaceReserved="false" />
+    <SwitchPreferenceCompat
+        app:key="Main/ApplyGameSettings"
+        app:title="Apply Compatibility Settings"
+        app:defaultValue="true"
+        app:summary="Automatically disable enhancements when they are not supported by games."
+        app:iconSpaceReserved="false" />
     <SwitchPreferenceCompat
         app:key="Display/VSync"
         app:title="Video Sync"