summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-01-27 18:17:27 +0100
committerGitHub <noreply@github.com>2021-01-27 18:17:27 +0100
commit70447d0281b09d53c7f80c056fe4ef7e65e88a58 (patch)
treecad60c3ccd1948f790e262dca804469a34e3086f /Source/Android
parentb886c70a432ba77549a449ba46c14018cc338e0f (diff)
parent5978550b2f2f728dccf9e28878a4b96ea8bac5cf (diff)
Merge pull request #9454 from JosJuice/android-ingame-settings-save
Android: Fix in-game settings changes not getting saved
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/jni/NativeConfig.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Android/jni/NativeConfig.cpp b/Source/Android/jni/NativeConfig.cpp
index 14d7d4af3e..270a999d0c 100644
--- a/Source/Android/jni/NativeConfig.cpp
+++ b/Source/Android/jni/NativeConfig.cpp
@@ -128,7 +128,12 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameIn
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save(
JNIEnv*, jclass, jint layer)
{
- return GetLayer(layer, {})->Save();
+ const std::shared_ptr<Config::Layer> layer_ptr = GetLayer(layer, {});
+
+ // Workaround for the Settings class carrying around a legacy map of settings it always saves
+ layer_ptr->MarkAsDirty();
+
+ return layer_ptr->Save();
}
JNIEXPORT jboolean JNICALL