piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
During emulation, when LocalGame has a value but CurrentRun
doesn't, we want to read from LocalGame, not CurrentRun. This
change exposes a LAYER_ACTIVE option that handles this correctly.
This commit is contained in:
JosJuice
2020-10-13 16:17:26 +02:00
parent dcaf2b9625
commit 2861248520
8 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@
constexpr jint LAYER_BASE_OR_CURRENT = 0;
constexpr jint LAYER_LOCAL_GAME = 1;
constexpr jint LAYER_ACTIVE = 2;
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)
{
Config::LayerType layer_type;
switch (layer)
{
case LAYER_BASE_OR_CURRENT:
if (GetActiveLayerForConfig(location) == Config::LayerType::Base)
return Config::GetLayer(Config::LayerType::Base);
layer_type = Config::LayerType::Base;
else
return Config::GetLayer(Config::LayerType::CurrentRun);
layer_type = Config::LayerType::CurrentRun;
break;
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:
ASSERT(false);
return nullptr;
}
return Config::GetLayer(layer_type);
}
template <typename T>