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 #9148 from JosJuice/android-active-layer 

Android: Fix setting read during play with local game layer active
This commit is contained in:
Léo Lam 2020-10-19 12:17:59 +02:00 committed by GitHub
parent b3cb08830b 2861248520
commit a209410e70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/AdHocBooleanSetting.java
View File

@ -35,18 +35,18 @@ public class AdHocBooleanSetting implements AbstractBooleanSetting
@Override @Override
public boolean delete(Settings settings) public boolean delete(Settings settings)
{ {
return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey); return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
} }
@Override @Override
public boolean getBoolean(Settings settings) 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 @Override
public void setBoolean(Settings settings, boolean newValue) public void setBoolean(Settings settings, boolean newValue)
{ {
NativeConfig.setBoolean(settings.getActiveLayer(), mFile, mSection, mKey, newValue); NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
} }
} }

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java
View File

@ -157,7 +157,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey); return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
} }
else else
{ {
@ -170,7 +170,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.getBoolean(settings.getActiveLayer(), mFile, mSection, mKey, return NativeConfig.getBoolean(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey,
mDefaultValue); mDefaultValue);
} }
else else
@ -184,7 +184,7 @@ public enum BooleanSetting implements AbstractBooleanSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
NativeConfig.setBoolean(settings.getActiveLayer(), mFile, mSection, mKey, newValue); NativeConfig.setBoolean(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
} }
else else
{ {

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java
View File

@ -40,7 +40,7 @@ public enum FloatSetting implements AbstractFloatSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey); return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
} }
else else
{ {
@ -53,7 +53,7 @@ public enum FloatSetting implements AbstractFloatSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) 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 else
{ {
@ -66,7 +66,7 @@ public enum FloatSetting implements AbstractFloatSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
NativeConfig.setFloat(settings.getActiveLayer(), mFile, mSection, mKey, newValue); NativeConfig.setFloat(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
} }
else else
{ {

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java
View File

@ -97,7 +97,7 @@ public enum IntSetting implements AbstractIntSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey); return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
} }
else else
{ {
@ -110,7 +110,7 @@ public enum IntSetting implements AbstractIntSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) 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 else
{ {
@ -123,7 +123,7 @@ public enum IntSetting implements AbstractIntSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
NativeConfig.setInt(settings.getActiveLayer(), mFile, mSection, mKey, newValue); NativeConfig.setInt(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
} }
else else
{ {

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/NativeConfig.java
View File

@ -4,6 +4,7 @@ public class NativeConfig
{ {
public static final int LAYER_BASE_OR_CURRENT = 0; public static final int LAYER_BASE_OR_CURRENT = 0;
public static final int LAYER_LOCAL_GAME = 1; 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); public static native boolean isSettingSaveable(String file, String section, String key);

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Settings.java
View File

@ -86,7 +86,7 @@ public class Settings implements Closeable
return !TextUtils.isEmpty(mGameId); return !TextUtils.isEmpty(mGameId);
} }
public int getActiveLayer() public int getWriteLayer()
{ {
return isGameSpecific() ? NativeConfig.LAYER_LOCAL_GAME : NativeConfig.LAYER_BASE_OR_CURRENT; return isGameSpecific() ? NativeConfig.LAYER_LOCAL_GAME : NativeConfig.LAYER_BASE_OR_CURRENT;
} }

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java
View File

@ -70,7 +70,7 @@ public enum StringSetting implements AbstractStringSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.deleteKey(settings.getActiveLayer(), mFile, mSection, mKey); return NativeConfig.deleteKey(settings.getWriteLayer(), mFile, mSection, mKey);
} }
else else
{ {
@ -83,7 +83,7 @@ public enum StringSetting implements AbstractStringSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
return NativeConfig.getString(settings.getActiveLayer(), mFile, mSection, mKey, return NativeConfig.getString(NativeConfig.LAYER_ACTIVE, mFile, mSection, mKey,
mDefaultValue); mDefaultValue);
} }
else else
@ -97,7 +97,7 @@ public enum StringSetting implements AbstractStringSetting
{ {
if (NativeConfig.isSettingSaveable(mFile, mSection, mKey)) if (NativeConfig.isSettingSaveable(mFile, mSection, mKey))
{ {
NativeConfig.setString(settings.getActiveLayer(), mFile, mSection, mKey, newValue); NativeConfig.setString(settings.getWriteLayer(), mFile, mSection, mKey, newValue);
} }
else else
{ {

17
Source/Android/jni/NativeConfig.cpp
View File

@ -15,6 +15,7 @@
constexpr jint LAYER_BASE_OR_CURRENT = 0; constexpr jint LAYER_BASE_OR_CURRENT = 0;
constexpr jint LAYER_LOCAL_GAME = 1; constexpr jint LAYER_LOCAL_GAME = 1;
constexpr jint LAYER_ACTIVE = 2;
static Config::Location GetLocation(JNIEnv* env, jstring file, jstring section, jstring key) static Config::Location GetLocation(JNIEnv* env, jstring file, jstring section, jstring key)
{ {
@ -48,21 +49,31 @@ static Config::Location GetLocation(JNIEnv* env, jstring file, jstring section,
static std::shared_ptr<Config::Layer> GetLayer(jint layer, const Config::Location& location) static std::shared_ptr<Config::Layer> GetLayer(jint layer, const Config::Location& location)
{ {
Config::LayerType layer_type;
switch (layer) switch (layer)
{ {
case LAYER_BASE_OR_CURRENT: case LAYER_BASE_OR_CURRENT:
if (GetActiveLayerForConfig(location) == Config::LayerType::Base) if (GetActiveLayerForConfig(location) == Config::LayerType::Base)
return Config::GetLayer(Config::LayerType::Base); layer_type = Config::LayerType::Base;
else else
return Config::GetLayer(Config::LayerType::CurrentRun); layer_type = Config::LayerType::CurrentRun;
break;
case LAYER_LOCAL_GAME: case LAYER_LOCAL_GAME:
return Config::GetLayer(Config::LayerType::LocalGame); layer_type = Config::LayerType::LocalGame;
break;
case LAYER_ACTIVE:
layer_type = Config::GetActiveLayerForConfig(location);
break;
default: default:
ASSERT(false); ASSERT(false);
return nullptr; return nullptr;
} }
return Config::GetLayer(layer_type);
} }
template <typename T> template <typename T>