Merge pull request #9148 from JosJuice/android-active-layer

Android: Fix setting read during play with local game layer active

7 files changed, 17 insertions, 16 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.java
index 9eecf8407f..0626852b5d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.java
@@ -35,18 +35,18 @@ public class AdHocBooleanSetting implements AbstractBooleanSetting
   @Override
   public boolean delete(Settings settings)
   {
-    return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey);
+    return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
   }
 
   @Override
   public boolean getBoolean(Settings settings)
   {
-    return NativeConfig.getBoolean(settings.getActiveLayer(), mFile, mSection, mKey, mDefaultValue);
+    return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
   }
 
   @Override
   public void setBoolean(Settings settings, boolean newValue)
   {
-    NativeConfig.setBoolean(settings.getActiveLayer(), mFile, mSection, mKey, newValue);
+    NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
   }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java
index 59a7a7161c..15d5d9069e 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java
@@ -157,7 +157,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey);
+      return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
     }
     else
     {
@@ -170,7 +170,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.getBoolean(settings.getActiveLayer(), mFile, mSection, mKey,
+      return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey,
               mDefaultValue);
     }
     else
@@ -184,7 +184,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setBoolean(settings.getActiveLayer(), mFile, mSection, mKey, newValue);
+      NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
     }
     else
     {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java
index 8dc2e2841f..d5fea9894a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java
@@ -40,7 +40,7 @@ public enum FloatSetting implements AbstractFloatSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey);
+      return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
     }
     else
     {
@@ -53,7 +53,7 @@ public enum FloatSetting implements AbstractFloatSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.getFloat(settings.getActiveLayer(), mFile, mSection, mKey, mDefaultValue);
+      return NativeConfig.getFloat(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
     }
     else
     {
@@ -66,7 +66,7 @@ public enum FloatSetting implements AbstractFloatSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setFloat(settings.getActiveLayer(), mFile, mSection, mKey, newValue);
+      NativeConfig.setFloat(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
     }
     else
     {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
index b6e0c6c290..7c2824ca1d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
@@ -97,7 +97,7 @@ public enum IntSetting implements AbstractIntSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey);
+      return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
     }
     else
     {
@@ -110,7 +110,7 @@ public enum IntSetting implements AbstractIntSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.getInt(settings.getActiveLayer(), mFile, mSection, mKey, mDefaultValue);
+      return NativeConfig.getInt(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey, mDefaultValue);
     }
     else
     {
@@ -123,7 +123,7 @@ public enum IntSetting implements AbstractIntSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setInt(settings.getActiveLayer(), mFile, mSection, mKey, newValue);
+      NativeConfig.setInt(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
     }
     else
     {
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.java
index 51c29f833b..edd1c065e4 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.java
@@ -4,6 +4,7 @@ public class NativeConfig
 {
   public static final int LAYER_BASE_OR_CURRENT = 0;
   public static final int LAYER_LOCAL_GAME = 1;
+  public static final int LAYER_ACTIVE = 2;
 
   public static native boolean isSettingSaveable(String file, String section, String key);
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
index 46222ed2e6..422b97acae 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
@@ -86,7 +86,7 @@ public class Settings implements Closeable
     return !TextUtils.isEmpty(mGameId);
   }
 
-  public int getActiveLayer()
+  public int getWriteLayer()
   {
     return isGameSpecific() ? NativeConfig.LAYER_LOCAL_GAME : NativeConfig.LAYER_BASE_OR_CURRENT;
   }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
index 272e2b02cd..387ee3a504 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
@@ -70,7 +70,7 @@ public enum StringSetting implements AbstractStringSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey);
+      return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
     }
     else
     {
@@ -83,7 +83,7 @@ public enum StringSetting implements AbstractStringSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      return NativeConfig.getString(settings.getActiveLayer(), mFile, mSection, mKey,
+      return NativeConfig.getString(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey,
               mDefaultValue);
     }
     else
@@ -97,7 +97,7 @@ public enum StringSetting implements AbstractStringSetting
   {
     if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
     {
-      NativeConfig.setString(settings.getActiveLayer(), mFile, mSection, mKey, newValue);
+      NativeConfig.setString(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
     }
     else
     {